diff --git a/bridge/telegram/html.go b/bridge/telegram/html.go
index 85547d7b..35b3f4f9 100644
--- a/bridge/telegram/html.go
+++ b/bridge/telegram/html.go
@@ -53,13 +53,16 @@ func (options *customHTML) ListItem(out *bytes.Buffer, text []byte, flags int) {
}
func makeHTML(input string) string {
- return string(blackfriday.Markdown([]byte(input),
- &customHTML{blackfriday.HtmlRenderer(blackfriday.HTML_USE_XHTML|blackfriday.HTML_SKIP_IMAGES, "", "")},
- blackfriday.EXTENSION_NO_INTRA_EMPHASIS|
- blackfriday.EXTENSION_FENCED_CODE|
- blackfriday.EXTENSION_AUTOLINK|
- blackfriday.EXTENSION_SPACE_HEADERS|
- blackfriday.EXTENSION_HEADER_IDS|
- blackfriday.EXTENSION_BACKSLASH_LINE_BREAK|
- blackfriday.EXTENSION_DEFINITION_LISTS))
+ extensions := blackfriday.NoIntraEmphasis |
+ blackfriday.FencedCode |
+ blackfriday.Autolink |
+ blackfriday.SpaceHeadings |
+ blackfriday.HeadingIDs |
+ blackfriday.BackslashLineBreak |
+ blackfriday.DefinitionLists
+
+ renderer := &customHTML{blackfriday.NewHTMLRenderer(blackfriday.HTMLRendererParameters{
+ Flags: blackfriday.UseXHTML | blackfriday.SkipImages,
+ })}
+ return string(blackfriday.Run([]byte(input), blackfriday.WithExtensions(extensions), blackfriday.WithRenderer(renderer)))
}
diff --git a/go.mod b/go.mod
index b5b18874..c0ae97ce 100644
--- a/go.mod
+++ b/go.mod
@@ -53,10 +53,11 @@ require (
github.com/pkg/errors v0.8.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rs/xid v0.0.0-20180525034800-088c5cf1423a
- github.com/russross/blackfriday v1.5.1
+ github.com/russross/blackfriday v2.0.0+incompatible
github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca
github.com/shazow/rateio v0.0.0-20150116013248-e8e00881e5c1 // indirect
github.com/shazow/ssh-chat v0.0.0-20171012174035-2078e1381991
+ github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 // indirect
github.com/sirupsen/logrus v0.0.0-20180213143110-8c0189d9f6bb
github.com/smartystreets/assertions v0.0.0-20180803164922-886ec427f6b9 // indirect
github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a // indirect
diff --git a/go.sum b/go.sum
index 832c279e..7d18f96e 100644
--- a/go.sum
+++ b/go.sum
@@ -105,14 +105,16 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rs/xid v0.0.0-20180525034800-088c5cf1423a h1:UWKek6MK3K6/TpbsFcv+8rrO6rSc6KKSp2FbMOHWsq4=
github.com/rs/xid v0.0.0-20180525034800-088c5cf1423a/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
-github.com/russross/blackfriday v1.5.1 h1:B8ZN6pD4PVofmlDCDUdELeYrbsVIDM/bpjW3v3zgcRc=
-github.com/russross/blackfriday v1.5.1/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday v2.0.0+incompatible h1:cBXrhZNUf9C+La9/YpS+UHpUT8YD6Td9ZMSU9APFcsk=
+github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca h1:NugYot0LIVPxTvN8n+Kvkn6TrbMyxQiuvKdEwFdR9vI=
github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU=
github.com/shazow/rateio v0.0.0-20150116013248-e8e00881e5c1 h1:Lx3BlDGFElJt4u/zKc9A3BuGYbQAGlEFyPuUA3jeMD0=
github.com/shazow/rateio v0.0.0-20150116013248-e8e00881e5c1/go.mod h1:vt2jWY/3Qw1bIzle5thrJWucsLuuX9iUNnp20CqCciI=
github.com/shazow/ssh-chat v0.0.0-20171012174035-2078e1381991 h1:PQiUTDzUC5EUh0vNurK7KQS22zlKqLLOFn+K9nJXDQQ=
github.com/shazow/ssh-chat v0.0.0-20171012174035-2078e1381991/go.mod h1:KwtnpMClmrXsHCKTbRui5xBUNt17n1GGrGhdiw2KcoY=
+github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 h1:/vdW8Cb7EXrkqWGufVMES1OH2sU9gKVb2n9/1y5NMBY=
+github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/sirupsen/logrus v0.0.0-20180213143110-8c0189d9f6bb h1:eKjx20EiekBRT2tjZ0XEdKpftfPJQwiavtFshwTyqf0=
github.com/sirupsen/logrus v0.0.0-20180213143110-8c0189d9f6bb/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
github.com/smartystreets/assertions v0.0.0-20180803164922-886ec427f6b9 h1:lXQ+j+KwZcbwrbgU0Rp4Eglg3EJLHbuZU3BbOqAGBmg=
diff --git a/vendor/github.com/russross/blackfriday/.travis.yml b/vendor/github.com/russross/blackfriday/.travis.yml
index a1687f17..a4eb2577 100644
--- a/vendor/github.com/russross/blackfriday/.travis.yml
+++ b/vendor/github.com/russross/blackfriday/.travis.yml
@@ -1,30 +1,18 @@
-sudo: false
+# Travis CI (http://travis-ci.org/) is a continuous integration service for
+# open source projects. This file configures it to run unit tests for
+# blackfriday.
+
language: go
+
go:
- - 1.5.4
- - 1.6.2
- - tip
-matrix:
- include:
- - go: 1.2.2
- script:
- - go get -t -v ./...
- - go test -v -race ./...
- - go: 1.3.3
- script:
- - go get -t -v ./...
- - go test -v -race ./...
- - go: 1.4.3
- script:
- - go get -t -v ./...
- - go test -v -race ./...
- allow_failures:
- - go: tip
- fast_finish: true
+ - 1.5
+ - 1.6
+ - 1.7
+
install:
- - # Do nothing. This is needed to prevent default install action "go get -t -v ./..." from happening here (we want it to happen inside script step).
+ - go get -d -t -v ./...
+ - go build -v ./...
+
script:
- - go get -t -v ./...
- - diff -u <(echo -n) <(gofmt -d -s .)
- - go tool vet .
- - go test -v -race ./...
+ - go test -v ./...
+ - go test -run=^$ -bench=BenchmarkReference -benchmem
diff --git a/vendor/github.com/russross/blackfriday/README.md b/vendor/github.com/russross/blackfriday/README.md
index a6c94b79..2e0db355 100644
--- a/vendor/github.com/russross/blackfriday/README.md
+++ b/vendor/github.com/russross/blackfriday/README.md
@@ -1,6 +1,4 @@
-Blackfriday
-[![Build Status][BuildSVG]][BuildURL]
-[![Godoc][GodocV2SVG]][GodocV2URL]
+Blackfriday [](https://travis-ci.org/russross/blackfriday)
===========
Blackfriday is a [Markdown][1] processor implemented in [Go][2]. It
@@ -18,27 +16,27 @@ It started as a translation from C of [Sundown][3].
Installation
------------
-Blackfriday is compatible with any modern Go release. With Go and git installed:
+Blackfriday is compatible with any modern Go release. With Go 1.7 and git
+installed:
- go get -u gopkg.in/russross/blackfriday.v2
+ go get gopkg.in/russross/blackfriday.v2
-will download, compile, and install the package into your `$GOPATH` directory
-hierarchy.
+will download, compile, and install the package into your `$GOPATH`
+directory hierarchy. Alternatively, you can achieve the same if you
+import it into a project:
+
+ import "gopkg.in/russross/blackfriday.v2"
+
+and `go get` without parameters.
Versions
--------
Currently maintained and recommended version of Blackfriday is `v2`. It's being
-developed on its own branch: https://github.com/russross/blackfriday/tree/v2 and the
-documentation is available at
-https://godoc.org/gopkg.in/russross/blackfriday.v2.
-
-It is `go get`-able via via [gopkg.in][6] at `gopkg.in/russross/blackfriday.v2`,
-but we highly recommend using package management tool like [dep][7] or
-[Glide][8] and make use of semantic versioning. With package management you
-should import `github.com/russross/blackfriday` and specify that you're using
-version 2.0.0.
+developed on its own branch: https://github.com/russross/blackfriday/v2. You
+should install and import it via [gopkg.in][6] at
+`gopkg.in/russross/blackfriday.v2`.
Version 2 offers a number of improvements over v1:
@@ -58,43 +56,9 @@ Potential drawbacks:
v2. See issue [#348](https://github.com/russross/blackfriday/issues/348) for
tracking.
-If you are still interested in the legacy `v1`, you can import it from
-`github.com/russross/blackfriday`. Documentation for the legacy v1 can be found
-here: https://godoc.org/github.com/russross/blackfriday
-
-### Known issue with `dep`
-
-There is a known problem with using Blackfriday v1 _transitively_ and `dep`.
-Currently `dep` prioritizes semver versions over anything else, and picks the
-latest one, plus it does not apply a `[[constraint]]` specifier to transitively
-pulled in packages. So if you're using something that uses Blackfriday v1, but
-that something does not use `dep` yet, you will get Blackfriday v2 pulled in and
-your first dependency will fail to build.
-
-There are couple of fixes for it, documented here:
-https://github.com/golang/dep/blob/master/docs/FAQ.md#how-do-i-constrain-a-transitive-dependencys-version
-
-Meanwhile, `dep` team is working on a more general solution to the constraints
-on transitive dependencies problem: https://github.com/golang/dep/issues/1124.
-
-
Usage
-----
-### v1
-
-For basic usage, it is as simple as getting your input into a byte
-slice and calling:
-
- output := blackfriday.MarkdownBasic(input)
-
-This renders it with no extensions enabled. To get a more useful
-feature set, use this instead:
-
- output := blackfriday.MarkdownCommon(input)
-
-### v2
-
For the most sensible markdown processing, it is as simple as getting your input
into a byte slice and calling:
@@ -121,7 +85,7 @@ Here's an example of simple usage of Blackfriday together with Bluemonday:
```go
import (
"github.com/microcosm-cc/bluemonday"
- "gopkg.in/russross/blackfriday.v2"
+ "github.com/russross/blackfriday"
)
// ...
@@ -129,21 +93,11 @@ unsafe := blackfriday.Run(input)
html := bluemonday.UGCPolicy().SanitizeBytes(unsafe)
```
-### Custom options, v1
-
-If you want to customize the set of options, first get a renderer
-(currently only the HTML output engine), then use it to
-call the more general `Markdown` function. For examples, see the
-implementations of `MarkdownBasic` and `MarkdownCommon` in
-`markdown.go`.
-
-### Custom options, v2
+### Custom options
If you want to customize the set of options, use `blackfriday.WithExtensions`,
`blackfriday.WithRenderer` and `blackfriday.WithRefOverride`.
-### `blackfriday-tool`
-
You can also check out `blackfriday-tool` for a more complete example
of how to use it. Download and install it using:
@@ -163,22 +117,6 @@ installed in `$GOPATH/bin`. This is a statically-linked binary that
can be copied to wherever you need it without worrying about
dependencies and library versions.
-### Sanitized anchor names
-
-Blackfriday includes an algorithm for creating sanitized anchor names
-corresponding to a given input text. This algorithm is used to create
-anchors for headings when `EXTENSION_AUTO_HEADER_IDS` is enabled. The
-algorithm has a specification, so that other packages can create
-compatible anchor names and links to those anchors.
-
-The specification is located at https://godoc.org/github.com/russross/blackfriday#hdr-Sanitized_Anchor_Names.
-
-[`SanitizedAnchorName`](https://godoc.org/github.com/russross/blackfriday#SanitizedAnchorName) exposes this functionality, and can be used to
-create compatible links to the anchor names generated by blackfriday.
-This algorithm is also implemented in a small standalone package at
-[`github.com/shurcooL/sanitized_anchor_name`](https://godoc.org/github.com/shurcooL/sanitized_anchor_name). It can be useful for clients
-that want a small package and don't need full functionality of blackfriday.
-
Features
--------
@@ -246,7 +184,7 @@ implements the following extensions:
and supply a language (to make syntax highlighting simple). Just
mark it like this:
- ``` go
+ ```go
func getTrue() bool {
return true
}
@@ -255,15 +193,6 @@ implements the following extensions:
You can use 3 or more backticks to mark the beginning of the
block, and the same number to mark the end of the block.
- To preserve classes of fenced code blocks while using the bluemonday
- HTML sanitizer, use the following policy:
-
- ``` go
- p := bluemonday.UGCPolicy()
- p.AllowAttrs("class").Matching(regexp.MustCompile("^language-[a-zA-Z0-9]+$")).OnElements("code")
- html := p.SanitizeBytes(unsafe)
- ```
-
* **Definition lists**. A simple definition list is made of a single-line
term followed by a colon and the definition for that term.
@@ -289,10 +218,8 @@ implements the following extensions:
* **Strikethrough**. Use two tildes (`~~`) to mark text that
should be crossed out.
-* **Hard line breaks**. With this extension enabled (it is off by
- default in the `MarkdownBasic` and `MarkdownCommon` convenience
- functions), newlines in the input translate into line breaks in
- the output.
+* **Hard line breaks**. With this extension enabled newlines in the input
+ translate into line breaks in the output. This extension is off by default.
* **Smart quotes**. Smartypants-style punctuation substitution is
supported, turning normal double- and single-quote marks into
@@ -332,14 +259,14 @@ are a few of note:
renders output as LaTeX.
-TODO
+Todo
----
* More unit testing
-* Improve Unicode support. It does not understand all Unicode
+* Improve unicode support. It does not understand all unicode
rules (about what constitutes a letter, a punctuation symbol,
etc.), so it may fail to detect word boundaries correctly in
- some instances. It is safe on all UTF-8 input.
+ some instances. It is safe on all utf-8 input.
License
@@ -354,10 +281,3 @@ License
[4]: https://godoc.org/gopkg.in/russross/blackfriday.v2#Parse "Parse func"
[5]: https://github.com/microcosm-cc/bluemonday "Bluemonday"
[6]: https://labix.org/gopkg.in "gopkg.in"
- [7]: https://github.com/golang/dep/ "dep"
- [8]: https://github.com/Masterminds/glide "Glide"
-
- [BuildSVG]: https://travis-ci.org/russross/blackfriday.svg?branch=master
- [BuildURL]: https://travis-ci.org/russross/blackfriday
- [GodocV2SVG]: https://godoc.org/gopkg.in/russross/blackfriday.v2?status.svg
- [GodocV2URL]: https://godoc.org/gopkg.in/russross/blackfriday.v2
diff --git a/vendor/github.com/russross/blackfriday/block.go b/vendor/github.com/russross/blackfriday/block.go
index 7fc731d5..d7da33f2 100644
--- a/vendor/github.com/russross/blackfriday/block.go
+++ b/vendor/github.com/russross/blackfriday/block.go
@@ -15,17 +15,26 @@ package blackfriday
import (
"bytes"
- "unicode"
+ "html"
+ "regexp"
+
+ "github.com/shurcooL/sanitized_anchor_name"
+)
+
+const (
+ charEntity = "&(?:#x[a-f0-9]{1,8}|#[0-9]{1,8}|[a-z][a-z0-9]{1,31});"
+ escapable = "[!\"#$%&'()*+,./:;<=>?@[\\\\\\]^_`{|}~-]"
+)
+
+var (
+ reBackslashOrAmp = regexp.MustCompile("[\\&]")
+ reEntityOrEscapedChar = regexp.MustCompile("(?i)\\\\" + escapable + "|" + charEntity)
)
// Parse block-level data.
// Note: this function and many that it calls assume that
// the input buffer ends with a newline.
-func (p *parser) block(out *bytes.Buffer, data []byte) {
- if len(data) == 0 || data[len(data)-1] != '\n' {
- panic("block input is missing terminating newline")
- }
-
+func (p *Markdown) block(data []byte) {
// this is called recursively: enforce a maximum depth
if p.nesting >= p.maxNesting {
return
@@ -34,14 +43,14 @@ func (p *parser) block(out *bytes.Buffer, data []byte) {
// parse out one block-level construct at a time
for len(data) > 0 {
- // prefixed header:
+ // prefixed heading:
//
- // # Header 1
- // ## Header 2
+ // # Heading 1
+ // ## Heading 2
// ...
- // ###### Header 6
- if p.isPrefixHeader(data) {
- data = data[p.prefixHeader(out, data):]
+ // ###### Heading 6
+ if p.isPrefixHeading(data) {
+ data = data[p.prefixHeading(data):]
continue
}
@@ -51,7 +60,7 @@ func (p *parser) block(out *bytes.Buffer, data []byte) {
// ...
//
if data[0] == '<' {
- if i := p.html(out, data, true); i > 0 {
+ if i := p.html(data, true); i > 0 {
data = data[i:]
continue
}
@@ -62,9 +71,9 @@ func (p *parser) block(out *bytes.Buffer, data []byte) {
// % stuff
// % more stuff
// % even more stuff
- if p.flags&EXTENSION_TITLEBLOCK != 0 {
+ if p.extensions&Titleblock != 0 {
if data[0] == '%' {
- if i := p.titleBlock(out, data, true); i > 0 {
+ if i := p.titleBlock(data, true); i > 0 {
data = data[i:]
continue
}
@@ -86,7 +95,7 @@ func (p *parser) block(out *bytes.Buffer, data []byte) {
// return b
// }
if p.codePrefix(data) > 0 {
- data = data[p.code(out, data):]
+ data = data[p.code(data):]
continue
}
@@ -100,8 +109,8 @@ func (p *parser) block(out *bytes.Buffer, data []byte) {
// return n * fact(n-1)
// }
// ```
- if p.flags&EXTENSION_FENCED_CODE != 0 {
- if i := p.fencedCodeBlock(out, data, true); i > 0 {
+ if p.extensions&FencedCode != 0 {
+ if i := p.fencedCodeBlock(data, true); i > 0 {
data = data[i:]
continue
}
@@ -115,9 +124,9 @@ func (p *parser) block(out *bytes.Buffer, data []byte) {
// or
// ______
if p.isHRule(data) {
- p.r.HRule(out)
+ p.addBlock(HorizontalRule, nil)
var i int
- for i = 0; data[i] != '\n'; i++ {
+ for i = 0; i < len(data) && data[i] != '\n'; i++ {
}
data = data[i:]
continue
@@ -128,7 +137,7 @@ func (p *parser) block(out *bytes.Buffer, data []byte) {
// > A big quote I found somewhere
// > on the web
if p.quotePrefix(data) > 0 {
- data = data[p.quote(out, data):]
+ data = data[p.quote(data):]
continue
}
@@ -138,8 +147,8 @@ func (p *parser) block(out *bytes.Buffer, data []byte) {
// ------|-----|---------
// Bob | 31 | 555-1234
// Alice | 27 | 555-4321
- if p.flags&EXTENSION_TABLES != 0 {
- if i := p.table(out, data); i > 0 {
+ if p.extensions&Tables != 0 {
+ if i := p.table(data); i > 0 {
data = data[i:]
continue
}
@@ -152,7 +161,7 @@ func (p *parser) block(out *bytes.Buffer, data []byte) {
//
// also works with + or -
if p.uliPrefix(data) > 0 {
- data = data[p.list(out, data, 0):]
+ data = data[p.list(data, 0):]
continue
}
@@ -161,7 +170,7 @@ func (p *parser) block(out *bytes.Buffer, data []byte) {
// 1. Item 1
// 2. Item 2
if p.oliPrefix(data) > 0 {
- data = data[p.list(out, data, LIST_TYPE_ORDERED):]
+ data = data[p.list(data, ListTypeOrdered):]
continue
}
@@ -173,55 +182,62 @@ func (p *parser) block(out *bytes.Buffer, data []byte) {
//
// Term 2
// : Definition c
- if p.flags&EXTENSION_DEFINITION_LISTS != 0 {
+ if p.extensions&DefinitionLists != 0 {
if p.dliPrefix(data) > 0 {
- data = data[p.list(out, data, LIST_TYPE_DEFINITION):]
+ data = data[p.list(data, ListTypeDefinition):]
continue
}
}
// anything else must look like a normal paragraph
- // note: this finds underlined headers, too
- data = data[p.paragraph(out, data):]
+ // note: this finds underlined headings, too
+ data = data[p.paragraph(data):]
}
p.nesting--
}
-func (p *parser) isPrefixHeader(data []byte) bool {
+func (p *Markdown) addBlock(typ NodeType, content []byte) *Node {
+ p.closeUnmatchedBlocks()
+ container := p.addChild(typ, 0)
+ container.content = content
+ return container
+}
+
+func (p *Markdown) isPrefixHeading(data []byte) bool {
if data[0] != '#' {
return false
}
- if p.flags&EXTENSION_SPACE_HEADERS != 0 {
+ if p.extensions&SpaceHeadings != 0 {
level := 0
- for level < 6 && data[level] == '#' {
+ for level < 6 && level < len(data) && data[level] == '#' {
level++
}
- if data[level] != ' ' {
+ if level == len(data) || data[level] != ' ' {
return false
}
}
return true
}
-func (p *parser) prefixHeader(out *bytes.Buffer, data []byte) int {
+func (p *Markdown) prefixHeading(data []byte) int {
level := 0
- for level < 6 && data[level] == '#' {
+ for level < 6 && level < len(data) && data[level] == '#' {
level++
}
i := skipChar(data, level, ' ')
end := skipUntilChar(data, i, '\n')
skip := end
id := ""
- if p.flags&EXTENSION_HEADER_IDS != 0 {
+ if p.extensions&HeadingIDs != 0 {
j, k := 0, 0
- // find start/end of header id
+ // find start/end of heading id
for j = i; j < end-1 && (data[j] != '{' || data[j+1] != '#'); j++ {
}
for k = j + 1; k < end && data[k] != '}'; k++ {
}
- // extract header id iff found
+ // extract heading id iff found
if j < end && k < end {
id = string(data[j+2 : k])
end = j
@@ -241,45 +257,41 @@ func (p *parser) prefixHeader(out *bytes.Buffer, data []byte) int {
end--
}
if end > i {
- if id == "" && p.flags&EXTENSION_AUTO_HEADER_IDS != 0 {
- id = SanitizedAnchorName(string(data[i:end]))
+ if id == "" && p.extensions&AutoHeadingIDs != 0 {
+ id = sanitized_anchor_name.Create(string(data[i:end]))
}
- work := func() bool {
- p.inline(out, data[i:end])
- return true
- }
- p.r.Header(out, work, level, id)
+ block := p.addBlock(Heading, data[i:end])
+ block.HeadingID = id
+ block.Level = level
}
return skip
}
-func (p *parser) isUnderlinedHeader(data []byte) int {
- // test of level 1 header
+func (p *Markdown) isUnderlinedHeading(data []byte) int {
+ // test of level 1 heading
if data[0] == '=' {
i := skipChar(data, 1, '=')
i = skipChar(data, i, ' ')
- if data[i] == '\n' {
+ if i < len(data) && data[i] == '\n' {
return 1
- } else {
- return 0
}
+ return 0
}
- // test of level 2 header
+ // test of level 2 heading
if data[0] == '-' {
i := skipChar(data, 1, '-')
i = skipChar(data, i, ' ')
- if data[i] == '\n' {
+ if i < len(data) && data[i] == '\n' {
return 2
- } else {
- return 0
}
+ return 0
}
return 0
}
-func (p *parser) titleBlock(out *bytes.Buffer, data []byte, doRender bool) int {
+func (p *Markdown) titleBlock(data []byte, doRender bool) int {
if data[0] != '%' {
return 0
}
@@ -293,12 +305,17 @@ func (p *parser) titleBlock(out *bytes.Buffer, data []byte, doRender bool) int {
}
data = bytes.Join(splitData[0:i], []byte("\n"))
- p.r.TitleBlock(out, data)
+ consumed := len(data)
+ data = bytes.TrimPrefix(data, []byte("% "))
+ data = bytes.Replace(data, []byte("\n% "), []byte("\n"), -1)
+ block := p.addBlock(Heading, data)
+ block.Level = 1
+ block.IsTitleblock = true
- return len(data)
+ return consumed
}
-func (p *parser) html(out *bytes.Buffer, data []byte, doRender bool) int {
+func (p *Markdown) html(data []byte, doRender bool) int {
var i, j int
// identify the opening tag
@@ -310,17 +327,12 @@ func (p *parser) html(out *bytes.Buffer, data []byte, doRender bool) int {
// handle special cases
if !tagfound {
// check for an HTML comment
- if size := p.htmlComment(out, data, doRender); size > 0 {
+ if size := p.htmlComment(data, doRender); size > 0 {
return size
}
// check for an
tag
- if size := p.htmlHr(out, data, doRender); size > 0 {
- return size
- }
-
- // check for HTML CDATA
- if size := p.htmlCDATA(out, data, doRender); size > 0 {
+ if size := p.htmlHr(data, doRender); size > 0 {
return size
}
@@ -395,60 +407,42 @@ func (p *parser) html(out *bytes.Buffer, data []byte, doRender bool) int {
for end > 0 && data[end-1] == '\n' {
end--
}
- p.r.BlockHtml(out, data[:end])
+ finalizeHTMLBlock(p.addBlock(HTMLBlock, data[:end]))
}
return i
}
-func (p *parser) renderHTMLBlock(out *bytes.Buffer, data []byte, start int, doRender bool) int {
- // html block needs to end with a blank line
- if i := p.isEmpty(data[start:]); i > 0 {
- size := start + i
+func finalizeHTMLBlock(block *Node) {
+ block.Literal = block.content
+ block.content = nil
+}
+
+// HTML comment, lax form
+func (p *Markdown) htmlComment(data []byte, doRender bool) int {
+ i := p.inlineHTMLComment(data)
+ // needs to end with a blank line
+ if j := p.isEmpty(data[i:]); j > 0 {
+ size := i + j
if doRender {
// trim trailing newlines
end := size
for end > 0 && data[end-1] == '\n' {
end--
}
- p.r.BlockHtml(out, data[:end])
+ block := p.addBlock(HTMLBlock, data[:end])
+ finalizeHTMLBlock(block)
}
return size
}
return 0
}
-// HTML comment, lax form
-func (p *parser) htmlComment(out *bytes.Buffer, data []byte, doRender bool) int {
- i := p.inlineHTMLComment(out, data)
- return p.renderHTMLBlock(out, data, i, doRender)
-}
-
-// HTML CDATA section
-func (p *parser) htmlCDATA(out *bytes.Buffer, data []byte, doRender bool) int {
- const cdataTag = "') {
- i++
- }
- i++
- // no end-of-comment marker
- if i >= len(data) {
- return 0
- }
- return p.renderHTMLBlock(out, data, i, doRender)
-}
-
// HR, which is the only self-closing block tag considered
-func (p *parser) htmlHr(out *bytes.Buffer, data []byte, doRender bool) int {
+func (p *Markdown) htmlHr(data []byte, doRender bool) int {
+ if len(data) < 4 {
+ return 0
+ }
if data[0] != '<' || (data[1] != 'h' && data[1] != 'H') || (data[2] != 'r' && data[2] != 'R') {
return 0
}
@@ -456,22 +450,31 @@ func (p *parser) htmlHr(out *bytes.Buffer, data []byte, doRender bool) int {
// not an
tag after all; at least not a valid one
return 0
}
-
i := 3
- for data[i] != '>' && data[i] != '\n' {
+ for i < len(data) && data[i] != '>' && data[i] != '\n' {
i++
}
-
- if data[i] == '>' {
- return p.renderHTMLBlock(out, data, i+1, doRender)
+ if i < len(data) && data[i] == '>' {
+ i++
+ if j := p.isEmpty(data[i:]); j > 0 {
+ size := i + j
+ if doRender {
+ // trim newlines
+ end := size
+ for end > 0 && data[end-1] == '\n' {
+ end--
+ }
+ finalizeHTMLBlock(p.addBlock(HTMLBlock, data[:end]))
+ }
+ return size
+ }
}
-
return 0
}
-func (p *parser) htmlFindTag(data []byte) (string, bool) {
+func (p *Markdown) htmlFindTag(data []byte) (string, bool) {
i := 0
- for isalnum(data[i]) {
+ for i < len(data) && isalnum(data[i]) {
i++
}
key := string(data[:i])
@@ -481,9 +484,11 @@ func (p *parser) htmlFindTag(data []byte) (string, bool) {
return "", false
}
-func (p *parser) htmlFindEnd(tag string, data []byte) int {
+func (p *Markdown) htmlFindEnd(tag string, data []byte) int {
// assume data[0] == '<' && data[1] == '/' already tested
-
+ if tag == "hr" {
+ return 2
+ }
// check if tag is a match
closetag := []byte("")
if !bytes.HasPrefix(data, closetag) {
@@ -503,7 +508,7 @@ func (p *parser) htmlFindEnd(tag string, data []byte) int {
return i
}
- if p.flags&EXTENSION_LAX_HTML_BLOCKS != 0 {
+ if p.extensions&LaxHTMLBlocks != 0 {
return i
}
if skip = p.isEmpty(data[i:]); skip == 0 {
@@ -514,7 +519,7 @@ func (p *parser) htmlFindEnd(tag string, data []byte) int {
return i + skip
}
-func (*parser) isEmpty(data []byte) int {
+func (*Markdown) isEmpty(data []byte) int {
// it is okay to call isEmpty on an empty buffer
if len(data) == 0 {
return 0
@@ -526,10 +531,13 @@ func (*parser) isEmpty(data []byte) int {
return 0
}
}
- return i + 1
+ if i < len(data) && data[i] == '\n' {
+ i++
+ }
+ return i
}
-func (*parser) isHRule(data []byte) bool {
+func (*Markdown) isHRule(data []byte) bool {
i := 0
// skip up to three spaces
@@ -545,7 +553,7 @@ func (*parser) isHRule(data []byte) bool {
// the whole line must be the char or whitespace
n := 0
- for data[i] != '\n' {
+ for i < len(data) && data[i] != '\n' {
switch {
case data[i] == c:
n++
@@ -561,8 +569,7 @@ func (*parser) isHRule(data []byte) bool {
// isFenceLine checks if there's a fence line (e.g., ``` or ``` go) at the beginning of data,
// and returns the end index if so, or 0 otherwise. It also returns the marker found.
// If syntax is not nil, it gets set to the syntax specified in the fence line.
-// A final newline is mandatory to recognize the fence line, unless newlineOptional is true.
-func isFenceLine(data []byte, syntax *string, oldmarker string, newlineOptional bool) (end int, marker string) {
+func isFenceLine(data []byte, syntax *string, oldmarker string) (end int, marker string) {
i, size := 0, 0
// skip up to three spaces
@@ -604,7 +611,7 @@ func isFenceLine(data []byte, syntax *string, oldmarker string, newlineOptional
i = skipChar(data, i, ' ')
if i >= len(data) {
- if newlineOptional && i == len(data) {
+ if i == len(data) {
return i, marker
}
return 0, ""
@@ -649,33 +656,33 @@ func isFenceLine(data []byte, syntax *string, oldmarker string, newlineOptional
i = skipChar(data, i, ' ')
if i >= len(data) || data[i] != '\n' {
- if newlineOptional && i == len(data) {
+ if i == len(data) {
return i, marker
}
return 0, ""
}
-
return i + 1, marker // Take newline into account.
}
// fencedCodeBlock returns the end index if data contains a fenced code block at the beginning,
// or 0 otherwise. It writes to out if doRender is true, otherwise it has no side effects.
// If doRender is true, a final newline is mandatory to recognize the fenced code block.
-func (p *parser) fencedCodeBlock(out *bytes.Buffer, data []byte, doRender bool) int {
+func (p *Markdown) fencedCodeBlock(data []byte, doRender bool) int {
var syntax string
- beg, marker := isFenceLine(data, &syntax, "", false)
+ beg, marker := isFenceLine(data, &syntax, "")
if beg == 0 || beg >= len(data) {
return 0
}
var work bytes.Buffer
+ work.Write([]byte(syntax))
+ work.WriteByte('\n')
for {
// safe to assume beg < len(data)
// check for the end of the code block
- newlineOptional := !doRender
- fenceEnd, _ := isFenceLine(data[beg:], nil, marker, newlineOptional)
+ fenceEnd, _ := isFenceLine(data[beg:], nil, marker)
if fenceEnd != 0 {
beg += fenceEnd
break
@@ -697,24 +704,55 @@ func (p *parser) fencedCodeBlock(out *bytes.Buffer, data []byte, doRender bool)
}
if doRender {
- p.r.BlockCode(out, work.Bytes(), syntax)
+ block := p.addBlock(CodeBlock, work.Bytes()) // TODO: get rid of temp buffer
+ block.IsFenced = true
+ finalizeCodeBlock(block)
}
return beg
}
-func (p *parser) table(out *bytes.Buffer, data []byte) int {
- var header bytes.Buffer
- i, columns := p.tableHeader(&header, data)
+func unescapeChar(str []byte) []byte {
+ if str[0] == '\\' {
+ return []byte{str[1]}
+ }
+ return []byte(html.UnescapeString(string(str)))
+}
+
+func unescapeString(str []byte) []byte {
+ if reBackslashOrAmp.Match(str) {
+ return reEntityOrEscapedChar.ReplaceAllFunc(str, unescapeChar)
+ }
+ return str
+}
+
+func finalizeCodeBlock(block *Node) {
+ if block.IsFenced {
+ newlinePos := bytes.IndexByte(block.content, '\n')
+ firstLine := block.content[:newlinePos]
+ rest := block.content[newlinePos+1:]
+ block.Info = unescapeString(bytes.Trim(firstLine, "\n"))
+ block.Literal = rest
+ } else {
+ block.Literal = block.content
+ }
+ block.content = nil
+}
+
+func (p *Markdown) table(data []byte) int {
+ table := p.addBlock(Table, nil)
+ i, columns := p.tableHeader(data)
if i == 0 {
+ p.tip = table.Parent
+ table.Unlink()
return 0
}
- var body bytes.Buffer
+ p.addBlock(TableBody, nil)
for i < len(data) {
pipes, rowStart := 0, i
- for ; data[i] != '\n'; i++ {
+ for ; i < len(data) && data[i] != '\n'; i++ {
if data[i] == '|' {
pipes++
}
@@ -726,12 +764,12 @@ func (p *parser) table(out *bytes.Buffer, data []byte) int {
}
// include the newline in data sent to tableRow
- i++
- p.tableRow(&body, data[rowStart:i], columns, false)
+ if i < len(data) && data[i] == '\n' {
+ i++
+ }
+ p.tableRow(data[rowStart:i], columns, false)
}
- p.r.Table(out, header.Bytes(), body.Bytes(), columns)
-
return i
}
@@ -744,10 +782,10 @@ func isBackslashEscaped(data []byte, i int) bool {
return backslashes&1 == 1
}
-func (p *parser) tableHeader(out *bytes.Buffer, data []byte) (size int, columns []int) {
+func (p *Markdown) tableHeader(data []byte) (size int, columns []CellAlignFlags) {
i := 0
colCount := 1
- for i = 0; data[i] != '\n'; i++ {
+ for i = 0; i < len(data) && data[i] != '\n'; i++ {
if data[i] == '|' && !isBackslashEscaped(data, i) {
colCount++
}
@@ -759,7 +797,11 @@ func (p *parser) tableHeader(out *bytes.Buffer, data []byte) (size int, columns
}
// include the newline in the data sent to tableRow
- header := data[:i+1]
+ j := i
+ if j < len(data) && data[j] == '\n' {
+ j++
+ }
+ header := data[:j]
// column count ignores pipes at beginning or end of line
if data[0] == '|' {
@@ -769,7 +811,7 @@ func (p *parser) tableHeader(out *bytes.Buffer, data []byte) (size int, columns
colCount--
}
- columns = make([]int, colCount)
+ columns = make([]CellAlignFlags, colCount)
// move on to the header underline
i++
@@ -785,27 +827,29 @@ func (p *parser) tableHeader(out *bytes.Buffer, data []byte) (size int, columns
// each column header is of form: / *:?-+:? *|/ with # dashes + # colons >= 3
// and trailing | optional on last column
col := 0
- for data[i] != '\n' {
+ for i < len(data) && data[i] != '\n' {
dashes := 0
if data[i] == ':' {
i++
- columns[col] |= TABLE_ALIGNMENT_LEFT
+ columns[col] |= TableAlignmentLeft
dashes++
}
- for data[i] == '-' {
+ for i < len(data) && data[i] == '-' {
i++
dashes++
}
- if data[i] == ':' {
+ if i < len(data) && data[i] == ':' {
i++
- columns[col] |= TABLE_ALIGNMENT_RIGHT
+ columns[col] |= TableAlignmentRight
dashes++
}
- for data[i] == ' ' {
+ for i < len(data) && data[i] == ' ' {
i++
}
-
+ if i == len(data) {
+ return
+ }
// end of column test is messy
switch {
case dashes < 3:
@@ -816,12 +860,12 @@ func (p *parser) tableHeader(out *bytes.Buffer, data []byte) (size int, columns
// marker found, now skip past trailing whitespace
col++
i++
- for data[i] == ' ' {
+ for i < len(data) && data[i] == ' ' {
i++
}
// trailing junk found after last column
- if col >= colCount && data[i] != '\n' {
+ if col >= colCount && i < len(data) && data[i] != '\n' {
return
}
@@ -842,27 +886,31 @@ func (p *parser) tableHeader(out *bytes.Buffer, data []byte) (size int, columns
return
}
- p.tableRow(out, header, columns, true)
- size = i + 1
+ p.addBlock(TableHead, nil)
+ p.tableRow(header, columns, true)
+ size = i
+ if size < len(data) && data[size] == '\n' {
+ size++
+ }
return
}
-func (p *parser) tableRow(out *bytes.Buffer, data []byte, columns []int, header bool) {
+func (p *Markdown) tableRow(data []byte, columns []CellAlignFlags, header bool) {
+ p.addBlock(TableRow, nil)
i, col := 0, 0
- var rowWork bytes.Buffer
if data[i] == '|' && !isBackslashEscaped(data, i) {
i++
}
for col = 0; col < len(columns) && i < len(data); col++ {
- for data[i] == ' ' {
+ for i < len(data) && data[i] == ' ' {
i++
}
cellStart := i
- for (data[i] != '|' || isBackslashEscaped(data, i)) && data[i] != '\n' {
+ for i < len(data) && (data[i] != '|' || isBackslashEscaped(data, i)) && data[i] != '\n' {
i++
}
@@ -871,42 +919,33 @@ func (p *parser) tableRow(out *bytes.Buffer, data []byte, columns []int, header
// skip the end-of-cell marker, possibly taking us past end of buffer
i++
- for cellEnd > cellStart && data[cellEnd-1] == ' ' {
+ for cellEnd > cellStart && cellEnd-1 < len(data) && data[cellEnd-1] == ' ' {
cellEnd--
}
- var cellWork bytes.Buffer
- p.inline(&cellWork, data[cellStart:cellEnd])
-
- if header {
- p.r.TableHeaderCell(&rowWork, cellWork.Bytes(), columns[col])
- } else {
- p.r.TableCell(&rowWork, cellWork.Bytes(), columns[col])
- }
+ cell := p.addBlock(TableCell, data[cellStart:cellEnd])
+ cell.IsHeader = header
+ cell.Align = columns[col]
}
// pad it out with empty columns to get the right number
for ; col < len(columns); col++ {
- if header {
- p.r.TableHeaderCell(&rowWork, nil, columns[col])
- } else {
- p.r.TableCell(&rowWork, nil, columns[col])
- }
+ cell := p.addBlock(TableCell, nil)
+ cell.IsHeader = header
+ cell.Align = columns[col]
}
// silently ignore rows with too many cells
-
- p.r.TableRow(out, rowWork.Bytes())
}
// returns blockquote prefix length
-func (p *parser) quotePrefix(data []byte) int {
+func (p *Markdown) quotePrefix(data []byte) int {
i := 0
- for i < 3 && data[i] == ' ' {
+ for i < 3 && i < len(data) && data[i] == ' ' {
i++
}
- if data[i] == '>' {
- if data[i+1] == ' ' {
+ if i < len(data) && data[i] == '>' {
+ if i+1 < len(data) && data[i+1] == ' ' {
return i + 2
}
return i + 1
@@ -916,7 +955,7 @@ func (p *parser) quotePrefix(data []byte) int {
// blockquote ends with at least one blank line
// followed by something without a blockquote prefix
-func (p *parser) terminateBlockquote(data []byte, beg, end int) bool {
+func (p *Markdown) terminateBlockquote(data []byte, beg, end int) bool {
if p.isEmpty(data[beg:]) <= 0 {
return false
}
@@ -927,7 +966,8 @@ func (p *parser) terminateBlockquote(data []byte, beg, end int) bool {
}
// parse a blockquote fragment
-func (p *parser) quote(out *bytes.Buffer, data []byte) int {
+func (p *Markdown) quote(data []byte) int {
+ block := p.addBlock(BlockQuote, nil)
var raw bytes.Buffer
beg, end := 0, 0
for beg < len(data) {
@@ -935,9 +975,9 @@ func (p *parser) quote(out *bytes.Buffer, data []byte) int {
// Step over whole lines, collecting them. While doing that, check for
// fenced code and if one's found, incorporate it altogether,
// irregardless of any contents inside it
- for data[end] != '\n' {
- if p.flags&EXTENSION_FENCED_CODE != 0 {
- if i := p.fencedCodeBlock(out, data[end:], false); i > 0 {
+ for end < len(data) && data[end] != '\n' {
+ if p.extensions&FencedCode != 0 {
+ if i := p.fencedCodeBlock(data[end:], false); i > 0 {
// -1 to compensate for the extra end++ after the loop:
end += i - 1
break
@@ -945,44 +985,47 @@ func (p *parser) quote(out *bytes.Buffer, data []byte) int {
}
end++
}
- end++
-
+ if end < len(data) && data[end] == '\n' {
+ end++
+ }
if pre := p.quotePrefix(data[beg:]); pre > 0 {
// skip the prefix
beg += pre
} else if p.terminateBlockquote(data, beg, end) {
break
}
-
// this line is part of the blockquote
raw.Write(data[beg:end])
beg = end
}
-
- var cooked bytes.Buffer
- p.block(&cooked, raw.Bytes())
- p.r.BlockQuote(out, cooked.Bytes())
+ p.block(raw.Bytes())
+ p.finalize(block)
return end
}
// returns prefix length for block code
-func (p *parser) codePrefix(data []byte) int {
- if data[0] == ' ' && data[1] == ' ' && data[2] == ' ' && data[3] == ' ' {
+func (p *Markdown) codePrefix(data []byte) int {
+ if len(data) >= 1 && data[0] == '\t' {
+ return 1
+ }
+ if len(data) >= 4 && data[0] == ' ' && data[1] == ' ' && data[2] == ' ' && data[3] == ' ' {
return 4
}
return 0
}
-func (p *parser) code(out *bytes.Buffer, data []byte) int {
+func (p *Markdown) code(data []byte) int {
var work bytes.Buffer
i := 0
for i < len(data) {
beg := i
- for data[i] != '\n' {
+ for i < len(data) && data[i] != '\n' {
+ i++
+ }
+ if i < len(data) && data[i] == '\n' {
i++
}
- i++
blankline := p.isEmpty(data[beg:i]) > 0
if pre := p.codePrefix(data[beg:i]); pre > 0 {
@@ -993,7 +1036,7 @@ func (p *parser) code(out *bytes.Buffer, data []byte) int {
break
}
- // verbatim copy to the working buffeu
+ // verbatim copy to the working buffer
if blankline {
work.WriteByte('\n')
} else {
@@ -1013,122 +1056,183 @@ func (p *parser) code(out *bytes.Buffer, data []byte) int {
work.WriteByte('\n')
- p.r.BlockCode(out, work.Bytes(), "")
+ block := p.addBlock(CodeBlock, work.Bytes()) // TODO: get rid of temp buffer
+ block.IsFenced = false
+ finalizeCodeBlock(block)
return i
}
// returns unordered list item prefix
-func (p *parser) uliPrefix(data []byte) int {
+func (p *Markdown) uliPrefix(data []byte) int {
i := 0
-
// start with up to 3 spaces
- for i < 3 && data[i] == ' ' {
+ for i < len(data) && i < 3 && data[i] == ' ' {
i++
}
-
- // need a *, +, or - followed by a space
+ if i >= len(data)-1 {
+ return 0
+ }
+ // need one of {'*', '+', '-'} followed by a space or a tab
if (data[i] != '*' && data[i] != '+' && data[i] != '-') ||
- data[i+1] != ' ' {
+ (data[i+1] != ' ' && data[i+1] != '\t') {
return 0
}
return i + 2
}
// returns ordered list item prefix
-func (p *parser) oliPrefix(data []byte) int {
+func (p *Markdown) oliPrefix(data []byte) int {
i := 0
// start with up to 3 spaces
- for i < 3 && data[i] == ' ' {
+ for i < 3 && i < len(data) && data[i] == ' ' {
i++
}
// count the digits
start := i
- for data[i] >= '0' && data[i] <= '9' {
+ for i < len(data) && data[i] >= '0' && data[i] <= '9' {
i++
}
+ if start == i || i >= len(data)-1 {
+ return 0
+ }
- // we need >= 1 digits followed by a dot and a space
- if start == i || data[i] != '.' || data[i+1] != ' ' {
+ // we need >= 1 digits followed by a dot and a space or a tab
+ if data[i] != '.' || !(data[i+1] == ' ' || data[i+1] == '\t') {
return 0
}
return i + 2
}
// returns definition list item prefix
-func (p *parser) dliPrefix(data []byte) int {
- i := 0
-
- // need a : followed by a spaces
- if data[i] != ':' || data[i+1] != ' ' {
+func (p *Markdown) dliPrefix(data []byte) int {
+ if len(data) < 2 {
return 0
}
- for data[i] == ' ' {
+ i := 0
+ // need a ':' followed by a space or a tab
+ if data[i] != ':' || !(data[i+1] == ' ' || data[i+1] == '\t') {
+ return 0
+ }
+ for i < len(data) && data[i] == ' ' {
i++
}
return i + 2
}
// parse ordered or unordered list block
-func (p *parser) list(out *bytes.Buffer, data []byte, flags int) int {
+func (p *Markdown) list(data []byte, flags ListType) int {
i := 0
- flags |= LIST_ITEM_BEGINNING_OF_LIST
- work := func() bool {
- for i < len(data) {
- skip := p.listItem(out, data[i:], &flags)
- i += skip
+ flags |= ListItemBeginningOfList
+ block := p.addBlock(List, nil)
+ block.ListFlags = flags
+ block.Tight = true
- if skip == 0 || flags&LIST_ITEM_END_OF_LIST != 0 {
- break
- }
- flags &= ^LIST_ITEM_BEGINNING_OF_LIST
+ for i < len(data) {
+ skip := p.listItem(data[i:], &flags)
+ if flags&ListItemContainsBlock != 0 {
+ block.ListData.Tight = false
}
- return true
+ i += skip
+ if skip == 0 || flags&ListItemEndOfList != 0 {
+ break
+ }
+ flags &= ^ListItemBeginningOfList
}
- p.r.List(out, work, flags)
+ above := block.Parent
+ finalizeList(block)
+ p.tip = above
return i
}
+// Returns true if block ends with a blank line, descending if needed
+// into lists and sublists.
+func endsWithBlankLine(block *Node) bool {
+ // TODO: figure this out. Always false now.
+ for block != nil {
+ //if block.lastLineBlank {
+ //return true
+ //}
+ t := block.Type
+ if t == List || t == Item {
+ block = block.LastChild
+ } else {
+ break
+ }
+ }
+ return false
+}
+
+func finalizeList(block *Node) {
+ block.open = false
+ item := block.FirstChild
+ for item != nil {
+ // check for non-final list item ending with blank line:
+ if endsWithBlankLine(item) && item.Next != nil {
+ block.ListData.Tight = false
+ break
+ }
+ // recurse into children of list item, to see if there are spaces
+ // between any of them:
+ subItem := item.FirstChild
+ for subItem != nil {
+ if endsWithBlankLine(subItem) && (item.Next != nil || subItem.Next != nil) {
+ block.ListData.Tight = false
+ break
+ }
+ subItem = subItem.Next
+ }
+ item = item.Next
+ }
+}
+
// Parse a single list item.
// Assumes initial prefix is already removed if this is a sublist.
-func (p *parser) listItem(out *bytes.Buffer, data []byte, flags *int) int {
+func (p *Markdown) listItem(data []byte, flags *ListType) int {
// keep track of the indentation of the first line
itemIndent := 0
- for itemIndent < 3 && data[itemIndent] == ' ' {
- itemIndent++
+ if data[0] == '\t' {
+ itemIndent += 4
+ } else {
+ for itemIndent < 3 && data[itemIndent] == ' ' {
+ itemIndent++
+ }
}
+ var bulletChar byte = '*'
i := p.uliPrefix(data)
if i == 0 {
i = p.oliPrefix(data)
+ } else {
+ bulletChar = data[i-2]
}
if i == 0 {
i = p.dliPrefix(data)
// reset definition term flag
if i > 0 {
- *flags &= ^LIST_TYPE_TERM
+ *flags &= ^ListTypeTerm
}
}
if i == 0 {
- // if in defnition list, set term flag and continue
- if *flags&LIST_TYPE_DEFINITION != 0 {
- *flags |= LIST_TYPE_TERM
+ // if in definition list, set term flag and continue
+ if *flags&ListTypeDefinition != 0 {
+ *flags |= ListTypeTerm
} else {
return 0
}
}
// skip leading whitespace on first line
- for data[i] == ' ' {
+ for i < len(data) && data[i] == ' ' {
i++
}
// find the end of the line
line := i
- for i > 0 && data[i-1] != '\n' {
+ for i > 0 && i < len(data) && data[i-1] != '\n' {
i++
}
@@ -1148,7 +1252,7 @@ gatherlines:
i++
// find the end of this line
- for data[i-1] != '\n' {
+ for i < len(data) && data[i-1] != '\n' {
i++
}
@@ -1156,18 +1260,24 @@ gatherlines:
// and move on to the next line
if p.isEmpty(data[line:i]) > 0 {
containsBlankLine = true
- raw.Write(data[line:i])
line = i
continue
}
// calculate the indentation
indent := 0
- for indent < 4 && line+indent < i && data[line+indent] == ' ' {
- indent++
+ indentIndex := 0
+ if data[line] == '\t' {
+ indentIndex++
+ indent += 4
+ } else {
+ for indent < 4 && line+indent < i && data[line+indent] == ' ' {
+ indent++
+ indentIndex++
+ }
}
- chunk := data[line+indent : i]
+ chunk := data[line+indentIndex : i]
// evaluate how this line fits in
switch {
@@ -1177,15 +1287,7 @@ gatherlines:
p.dliPrefix(chunk) > 0:
if containsBlankLine {
- // end the list if the type changed after a blank line
- if indent <= itemIndent &&
- ((*flags&LIST_TYPE_ORDERED != 0 && p.uliPrefix(chunk) > 0) ||
- (*flags&LIST_TYPE_ORDERED == 0 && p.oliPrefix(chunk) > 0)) {
-
- *flags |= LIST_ITEM_END_OF_LIST
- break gatherlines
- }
- *flags |= LIST_ITEM_CONTAINS_BLOCK
+ *flags |= ListItemContainsBlock
}
// to be a nested list, it must be indented more
@@ -1199,93 +1301,89 @@ gatherlines:
sublist = raw.Len()
}
- // is this a nested prefix header?
- case p.isPrefixHeader(chunk):
- // if the header is not indented, it is not nested in the list
+ // is this a nested prefix heading?
+ case p.isPrefixHeading(chunk):
+ // if the heading is not indented, it is not nested in the list
// and thus ends the list
if containsBlankLine && indent < 4 {
- *flags |= LIST_ITEM_END_OF_LIST
+ *flags |= ListItemEndOfList
break gatherlines
}
- *flags |= LIST_ITEM_CONTAINS_BLOCK
+ *flags |= ListItemContainsBlock
// anything following an empty line is only part
// of this item if it is indented 4 spaces
// (regardless of the indentation of the beginning of the item)
case containsBlankLine && indent < 4:
- if *flags&LIST_TYPE_DEFINITION != 0 && i < len(data)-1 {
+ if *flags&ListTypeDefinition != 0 && i < len(data)-1 {
// is the next item still a part of this list?
next := i
- for data[next] != '\n' {
+ for next < len(data) && data[next] != '\n' {
next++
}
for next < len(data)-1 && data[next] == '\n' {
next++
}
if i < len(data)-1 && data[i] != ':' && data[next] != ':' {
- *flags |= LIST_ITEM_END_OF_LIST
+ *flags |= ListItemEndOfList
}
} else {
- *flags |= LIST_ITEM_END_OF_LIST
+ *flags |= ListItemEndOfList
}
break gatherlines
// a blank line means this should be parsed as a block
case containsBlankLine:
- *flags |= LIST_ITEM_CONTAINS_BLOCK
+ raw.WriteByte('\n')
+ *flags |= ListItemContainsBlock
}
- containsBlankLine = false
+ // if this line was preceded by one or more blanks,
+ // re-introduce the blank into the buffer
+ if containsBlankLine {
+ containsBlankLine = false
+ raw.WriteByte('\n')
+ }
// add the line into the working buffer without prefix
- raw.Write(data[line+indent : i])
+ raw.Write(data[line+indentIndex : i])
line = i
}
- // If reached end of data, the Renderer.ListItem call we're going to make below
- // is definitely the last in the list.
- if line >= len(data) {
- *flags |= LIST_ITEM_END_OF_LIST
- }
-
rawBytes := raw.Bytes()
+ block := p.addBlock(Item, nil)
+ block.ListFlags = *flags
+ block.Tight = false
+ block.BulletChar = bulletChar
+ block.Delimiter = '.' // Only '.' is possible in Markdown, but ')' will also be possible in CommonMark
+
// render the contents of the list item
- var cooked bytes.Buffer
- if *flags&LIST_ITEM_CONTAINS_BLOCK != 0 && *flags&LIST_TYPE_TERM == 0 {
+ if *flags&ListItemContainsBlock != 0 && *flags&ListTypeTerm == 0 {
// intermediate render of block item, except for definition term
if sublist > 0 {
- p.block(&cooked, rawBytes[:sublist])
- p.block(&cooked, rawBytes[sublist:])
+ p.block(rawBytes[:sublist])
+ p.block(rawBytes[sublist:])
} else {
- p.block(&cooked, rawBytes)
+ p.block(rawBytes)
}
} else {
// intermediate render of inline item
if sublist > 0 {
- p.inline(&cooked, rawBytes[:sublist])
- p.block(&cooked, rawBytes[sublist:])
+ child := p.addChild(Paragraph, 0)
+ child.content = rawBytes[:sublist]
+ p.block(rawBytes[sublist:])
} else {
- p.inline(&cooked, rawBytes)
+ child := p.addChild(Paragraph, 0)
+ child.content = rawBytes
}
}
-
- // render the actual list item
- cookedBytes := cooked.Bytes()
- parsedEnd := len(cookedBytes)
-
- // strip trailing newlines
- for parsedEnd > 0 && cookedBytes[parsedEnd-1] == '\n' {
- parsedEnd--
- }
- p.r.ListItem(out, cookedBytes[:parsedEnd], *flags)
-
return line
}
// render a single paragraph that has already been parsed out
-func (p *parser) renderParagraph(out *bytes.Buffer, data []byte) {
+func (p *Markdown) renderParagraph(data []byte) {
if len(data) == 0 {
return
}
@@ -1296,27 +1394,29 @@ func (p *parser) renderParagraph(out *bytes.Buffer, data []byte) {
beg++
}
+ end := len(data)
// trim trailing newline
- end := len(data) - 1
+ if data[len(data)-1] == '\n' {
+ end--
+ }
// trim trailing spaces
for end > beg && data[end-1] == ' ' {
end--
}
- work := func() bool {
- p.inline(out, data[beg:end])
- return true
- }
- p.r.Paragraph(out, work)
+ p.addBlock(Paragraph, data[beg:end])
}
-func (p *parser) paragraph(out *bytes.Buffer, data []byte) int {
+func (p *Markdown) paragraph(data []byte) int {
// prev: index of 1st char of previous line
// line: index of 1st char of current line
// i: index of cursor/end of current line
var prev, line, i int
-
+ tabSize := TabSizeDefault
+ if p.extensions&TabSizeEight != 0 {
+ tabSize = TabSizeDouble
+ }
// keep going until we find something to mark the end of the paragraph
for i < len(data) {
// mark the beginning of the current line
@@ -1324,24 +1424,32 @@ func (p *parser) paragraph(out *bytes.Buffer, data []byte) int {
current := data[i:]
line = i
+ // did we find a reference or a footnote? If so, end a paragraph
+ // preceding it and report that we have consumed up to the end of that
+ // reference:
+ if refEnd := isReference(p, current, tabSize); refEnd > 0 {
+ p.renderParagraph(data[:i])
+ return i + refEnd
+ }
+
// did we find a blank line marking the end of the paragraph?
if n := p.isEmpty(current); n > 0 {
// did this blank line followed by a definition list item?
- if p.flags&EXTENSION_DEFINITION_LISTS != 0 {
+ if p.extensions&DefinitionLists != 0 {
if i < len(data)-1 && data[i+1] == ':' {
- return p.list(out, data[prev:], LIST_TYPE_DEFINITION)
+ return p.list(data[prev:], ListTypeDefinition)
}
}
- p.renderParagraph(out, data[:i])
+ p.renderParagraph(data[:i])
return i + n
}
- // an underline under some text marks a header, so our paragraph ended on prev line
+ // an underline under some text marks a heading, so our paragraph ended on prev line
if i > 0 {
- if level := p.isUnderlinedHeader(current); level > 0 {
+ if level := p.isUnderlinedHeading(current); level > 0 {
// render the paragraph
- p.renderParagraph(out, data[:prev])
+ p.renderParagraph(data[:prev])
// ignore leading and trailing whitespace
eol := i - 1
@@ -1352,24 +1460,17 @@ func (p *parser) paragraph(out *bytes.Buffer, data []byte) int {
eol--
}
- // render the header
- // this ugly double closure avoids forcing variables onto the heap
- work := func(o *bytes.Buffer, pp *parser, d []byte) func() bool {
- return func() bool {
- pp.inline(o, d)
- return true
- }
- }(out, p, data[prev:eol])
-
id := ""
- if p.flags&EXTENSION_AUTO_HEADER_IDS != 0 {
- id = SanitizedAnchorName(string(data[prev:eol]))
+ if p.extensions&AutoHeadingIDs != 0 {
+ id = sanitized_anchor_name.Create(string(data[prev:eol]))
}
- p.r.Header(out, work, level, id)
+ block := p.addBlock(Heading, data[prev:eol])
+ block.Level = level
+ block.HeadingID = id
// find the end of the underline
- for data[i] != '\n' {
+ for i < len(data) && data[i] != '\n' {
i++
}
return i
@@ -1377,74 +1478,72 @@ func (p *parser) paragraph(out *bytes.Buffer, data []byte) int {
}
// if the next line starts a block of HTML, then the paragraph ends here
- if p.flags&EXTENSION_LAX_HTML_BLOCKS != 0 {
- if data[i] == '<' && p.html(out, current, false) > 0 {
+ if p.extensions&LaxHTMLBlocks != 0 {
+ if data[i] == '<' && p.html(current, false) > 0 {
// rewind to before the HTML block
- p.renderParagraph(out, data[:i])
+ p.renderParagraph(data[:i])
return i
}
}
- // if there's a prefixed header or a horizontal rule after this, paragraph is over
- if p.isPrefixHeader(current) || p.isHRule(current) {
- p.renderParagraph(out, data[:i])
+ // if there's a prefixed heading or a horizontal rule after this, paragraph is over
+ if p.isPrefixHeading(current) || p.isHRule(current) {
+ p.renderParagraph(data[:i])
return i
}
// if there's a fenced code block, paragraph is over
- if p.flags&EXTENSION_FENCED_CODE != 0 {
- if p.fencedCodeBlock(out, current, false) > 0 {
- p.renderParagraph(out, data[:i])
+ if p.extensions&FencedCode != 0 {
+ if p.fencedCodeBlock(current, false) > 0 {
+ p.renderParagraph(data[:i])
return i
}
}
// if there's a definition list item, prev line is a definition term
- if p.flags&EXTENSION_DEFINITION_LISTS != 0 {
+ if p.extensions&DefinitionLists != 0 {
if p.dliPrefix(current) != 0 {
- return p.list(out, data[prev:], LIST_TYPE_DEFINITION)
+ ret := p.list(data[prev:], ListTypeDefinition)
+ return ret
}
}
// if there's a list after this, paragraph is over
- if p.flags&EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK != 0 {
+ if p.extensions&NoEmptyLineBeforeBlock != 0 {
if p.uliPrefix(current) != 0 ||
p.oliPrefix(current) != 0 ||
p.quotePrefix(current) != 0 ||
p.codePrefix(current) != 0 {
- p.renderParagraph(out, data[:i])
+ p.renderParagraph(data[:i])
return i
}
}
// otherwise, scan to the beginning of the next line
- for data[i] != '\n' {
- i++
+ nl := bytes.IndexByte(data[i:], '\n')
+ if nl >= 0 {
+ i += nl + 1
+ } else {
+ i += len(data[i:])
}
- i++
}
- p.renderParagraph(out, data[:i])
+ p.renderParagraph(data[:i])
return i
}
-// SanitizedAnchorName returns a sanitized anchor name for the given text.
-//
-// It implements the algorithm specified in the package comment.
-func SanitizedAnchorName(text string) string {
- var anchorName []rune
- futureDash := false
- for _, r := range text {
- switch {
- case unicode.IsLetter(r) || unicode.IsNumber(r):
- if futureDash && len(anchorName) > 0 {
- anchorName = append(anchorName, '-')
- }
- futureDash = false
- anchorName = append(anchorName, unicode.ToLower(r))
- default:
- futureDash = true
- }
+func skipChar(data []byte, start int, char byte) int {
+ i := start
+ for i < len(data) && data[i] == char {
+ i++
}
- return string(anchorName)
+ return i
+}
+
+func skipUntilChar(text []byte, start int, char byte) int {
+ i := start
+ for i < len(text) && text[i] != char {
+ i++
+ }
+ return i
}
diff --git a/vendor/github.com/russross/blackfriday/doc.go b/vendor/github.com/russross/blackfriday/doc.go
index 9656c42a..5b3fa987 100644
--- a/vendor/github.com/russross/blackfriday/doc.go
+++ b/vendor/github.com/russross/blackfriday/doc.go
@@ -1,32 +1,18 @@
-// Package blackfriday is a Markdown processor.
+// Package blackfriday is a markdown processor.
//
-// It translates plain text with simple formatting rules into HTML or LaTeX.
+// It translates plain text with simple formatting rules into an AST, which can
+// then be further processed to HTML (provided by Blackfriday itself) or other
+// formats (provided by the community).
//
-// Sanitized Anchor Names
+// The simplest way to invoke Blackfriday is to call the Run function. It will
+// take a text input and produce a text output in HTML (or other format).
//
-// Blackfriday includes an algorithm for creating sanitized anchor names
-// corresponding to a given input text. This algorithm is used to create
-// anchors for headings when EXTENSION_AUTO_HEADER_IDS is enabled. The
-// algorithm is specified below, so that other packages can create
-// compatible anchor names and links to those anchors.
+// A slightly more sophisticated way to use Blackfriday is to create a Markdown
+// processor and to call Parse, which returns a syntax tree for the input
+// document. You can leverage Blackfriday's parsing for content extraction from
+// markdown documents. You can assign a custom renderer and set various options
+// to the Markdown processor.
//
-// The algorithm iterates over the input text, interpreted as UTF-8,
-// one Unicode code point (rune) at a time. All runes that are letters (category L)
-// or numbers (category N) are considered valid characters. They are mapped to
-// lower case, and included in the output. All other runes are considered
-// invalid characters. Invalid characters that preceed the first valid character,
-// as well as invalid character that follow the last valid character
-// are dropped completely. All other sequences of invalid characters
-// between two valid characters are replaced with a single dash character '-'.
-//
-// SanitizedAnchorName exposes this functionality, and can be used to
-// create compatible links to the anchor names generated by blackfriday.
-// This algorithm is also implemented in a small standalone package at
-// github.com/shurcooL/sanitized_anchor_name. It can be useful for clients
-// that want a small package and don't need full functionality of blackfriday.
+// If you're interested in calling Blackfriday from command line, see
+// https://github.com/russross/blackfriday-tool.
package blackfriday
-
-// NOTE: Keep Sanitized Anchor Name algorithm in sync with package
-// github.com/shurcooL/sanitized_anchor_name.
-// Otherwise, users of sanitized_anchor_name will get anchor names
-// that are incompatible with those generated by blackfriday.
diff --git a/vendor/github.com/russross/blackfriday/esc.go b/vendor/github.com/russross/blackfriday/esc.go
new file mode 100644
index 00000000..6385f27c
--- /dev/null
+++ b/vendor/github.com/russross/blackfriday/esc.go
@@ -0,0 +1,34 @@
+package blackfriday
+
+import (
+ "html"
+ "io"
+)
+
+var htmlEscaper = [256][]byte{
+ '&': []byte("&"),
+ '<': []byte("<"),
+ '>': []byte(">"),
+ '"': []byte("""),
+}
+
+func escapeHTML(w io.Writer, s []byte) {
+ var start, end int
+ for end < len(s) {
+ escSeq := htmlEscaper[s[end]]
+ if escSeq != nil {
+ w.Write(s[start:end])
+ w.Write(escSeq)
+ start = end + 1
+ }
+ end++
+ }
+ if start < len(s) && end <= len(s) {
+ w.Write(s[start:end])
+ }
+}
+
+func escLink(w io.Writer, text []byte) {
+ unesc := html.UnescapeString(string(text))
+ escapeHTML(w, []byte(unesc))
+}
diff --git a/vendor/github.com/russross/blackfriday/html.go b/vendor/github.com/russross/blackfriday/html.go
index c917c7d3..25fb185e 100644
--- a/vendor/github.com/russross/blackfriday/html.go
+++ b/vendor/github.com/russross/blackfriday/html.go
@@ -18,46 +18,62 @@ package blackfriday
import (
"bytes"
"fmt"
+ "io"
"regexp"
- "strconv"
"strings"
)
-// Html renderer configuration options.
+// HTMLFlags control optional behavior of HTML renderer.
+type HTMLFlags int
+
+// HTML renderer configuration options.
const (
- HTML_SKIP_HTML = 1 << iota // skip preformatted HTML blocks
- HTML_SKIP_STYLE // skip embedded