actions/mark
1
0
Fork 0
mirror of https://github.com/kovetskiy/mark.git synced 2025-04-24 05:42:40 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix paragraphs

Browse Source
This commit is contained in:
Manuel Rüger 2024-08-12 14:14:25 +02:00
parent b7f4b5c6a2
commit eb39e035f0
26 changed files with 145 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/mark/renderer/paragraph.go
View File

@ -24,7 +24,20 @@ func (r *ConfluenceParagraphRenderer) RegisterFuncs(reg renderer.NodeRendererFun
} }
func (r *ConfluenceParagraphRenderer) renderParagraph(w util.BufWriter, source []byte, n ast.Node, entering bool) (ast.WalkStatus, error) { func (r *ConfluenceParagraphRenderer) renderParagraph(w util.BufWriter, source []byte, n ast.Node, entering bool) (ast.WalkStatus, error) {
if !entering { if entering {
if n.FirstChild().Kind() != ast.KindRawHTML {
if n.Attributes() != nil {
_, _ = w.WriteString("<p")
html.RenderAttributes(w, n, html.ParagraphAttributeFilter)
_ = w.WriteByte('>')
} else {
_, _ = w.WriteString("<p>")
}
}
} else {
if n.FirstChild().Kind() != ast.KindRawHTML {
_, _ = w.WriteString("</p>")
}
_, _ = w.WriteString("\n") _, _ = w.WriteString("\n")
} }
return ast.WalkContinue, nil return ast.WalkContinue, nil

6
pkg/mark/testdata/codes-droph1.html vendored
View File

@ -1,7 +1,7 @@
<code>inline</code> <p><code>inline</code></p>
<ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[some code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code bash]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[with a newline <ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[some code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code bash]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[with a newline
]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code]]></ac:plain-text-body></ac:structured-macro>text ]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code]]></ac:plain-text-body></ac:structured-macro><p>text
text 2 text 2</p>
<ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code 2]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">sh</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[no-collapse-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[collapse-and-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">c</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:plain-text-body><![CDATA[collapse-no-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">nested</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code <ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code 2]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">sh</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[no-collapse-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[collapse-and-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">c</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:plain-text-body><![CDATA[collapse-no-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">nested</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code
``` more code ``` ``` more code ```
even more code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[indented code block even more code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[indented code block

4
pkg/mark/testdata/codes-stripnewlines.html vendored
View File

@ -1,6 +1,6 @@
<code>inline</code> <p><code>inline</code></p>
<ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[some code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code bash]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[with a newline <ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[some code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code bash]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[with a newline
]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code]]></ac:plain-text-body></ac:structured-macro>text text 2 ]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code]]></ac:plain-text-body></ac:structured-macro><p>text text 2</p>
<ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code 2]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">sh</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[no-collapse-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[collapse-and-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">c</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:plain-text-body><![CDATA[collapse-no-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">nested</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code <ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code 2]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">sh</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[no-collapse-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[collapse-and-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">c</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:plain-text-body><![CDATA[collapse-no-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">nested</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code
``` more code ``` ``` more code ```
even more code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[indented code block even more code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[indented code block

6
pkg/mark/testdata/codes.html vendored
View File

@ -1,7 +1,7 @@
<code>inline</code> <p><code>inline</code></p>
<ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[some code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code bash]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[with a newline <ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[some code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code bash]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[with a newline
]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code]]></ac:plain-text-body></ac:structured-macro>text ]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code]]></ac:plain-text-body></ac:structured-macro><p>text
text 2 text 2</p>
<ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code 2]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">sh</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[no-collapse-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[collapse-and-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">c</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:plain-text-body><![CDATA[collapse-no-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">nested</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code <ac:structured-macro ac:name="code"><ac:parameter ac:name="language">unknown</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[unknown code 2]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">sh</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[no-collapse-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">bash</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:parameter ac:name="title">A b c</ac:parameter><ac:plain-text-body><![CDATA[collapse-and-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">c</ac:parameter><ac:parameter ac:name="collapse">true</ac:parameter><ac:plain-text-body><![CDATA[collapse-no-title]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language">nested</ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[code
``` more code ``` ``` more code ```
even more code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[indented code block even more code]]></ac:plain-text-body></ac:structured-macro><ac:structured-macro ac:name="code"><ac:parameter ac:name="language"></ac:parameter><ac:parameter ac:name="collapse">false</ac:parameter><ac:plain-text-body><![CDATA[indented code block

2
pkg/mark/testdata/issue-64-broken-link-droph1.html vendored
View File

@ -1 +1 @@
<a href="Page2#Page2-Releasev71-22-Feb-2018(intern)">v71</a> <p><a href="Page2#Page2-Releasev71-22-Feb-2018(intern)">v71</a></p>

2
pkg/mark/testdata/issue-64-broken-link-stripnewlines.html vendored
View File

@ -1 +1 @@
<a href="Page2#Page2-Releasev71-22-Feb-2018(intern)">v71</a> <p><a href="Page2#Page2-Releasev71-22-Feb-2018(intern)">v71</a></p>

2
pkg/mark/testdata/issue-64-broken-link.html vendored
View File

@ -1 +1 @@
<a href="Page2#Page2-Releasev71-22-Feb-2018(intern)">v71</a> <p><a href="Page2#Page2-Releasev71-22-Feb-2018(intern)">v71</a></p>

28
pkg/mark/testdata/links-droph1.html vendored
View File

@ -1,21 +1,21 @@
Use <a href="https://example.com">https://example.com</a> <p>Use <a href="https://example.com">https://example.com</a></p>
Use <ac:rich-text-body>aaa</ac:rich-text-body> <p>Use <ac:rich-text-body>aaa</ac:rich-text-body></p>
Use <ac:link><ri:page ri:content-title="Page"/><ac:plain-text-link-body><![CDATA[page link]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="Page"/><ac:plain-text-link-body><![CDATA[page link]]></ac:plain-text-link-body></ac:link></p>
Use <ac:link><ri:page ri:content-title="AnotherPage"/><ac:plain-text-link-body><![CDATA[AnotherPage]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="AnotherPage"/><ac:plain-text-link-body><![CDATA[AnotherPage]]></ac:plain-text-link-body></ac:link></p>
Use <ac:link><ri:page ri:content-title="Another Page"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="Another Page"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link></p>
Use <ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link></p>
Use <ac:link><ri:page ri:content-title="Page With Space"/><ac:plain-text-link-body><![CDATA[page link with spaces]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="Page With Space"/><ac:plain-text-link-body><![CDATA[page link with spaces]]></ac:plain-text-link-body></ac:link></p>
<ac:image ac:alt="My Image"><ri:attachment ri:filename="test.png"/></ac:image> <p><ac:image ac:alt="My Image"><ri:attachment ri:filename="test.png"/></ac:image></p>
<ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&amp;key2=value2"/></ac:image> <p><ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&amp;key2=value2"/></ac:image></p>
<ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[My test_link]]></ac:plain-text-link-body></ac:link> <p><ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[My test_link]]></ac:plain-text-link-body></ac:link></p>
<ac:link><ri:page ri:content-title="test_link_link"/><ac:plain-text-link-body><![CDATA[Another [Link]]]></ac:plain-text-link-body></ac:link> <p><ac:link><ri:page ri:content-title="test_link_link"/><ac:plain-text-link-body><![CDATA[Another [Link]]]></ac:plain-text-link-body></ac:link></p>
Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup> <p>Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup></p>
Use <a href="foo">Link [Text]</a> <p>Use <a href="foo">Link [Text]</a></p>
<div class="footnotes" role="doc-endnotes"> <div class="footnotes" role="doc-endnotes">
<hr /> <hr />
<ol> <ol>
<li id="fn:1"> <li id="fn:1">
a footnote link&#160;<a href="#fnref:1" class="footnote-backref" role="doc-backlink">&#x21a9;&#xfe0e;</a> <p>a footnote link&#160;<a href="#fnref:1" class="footnote-backref" role="doc-backlink">&#x21a9;&#xfe0e;</a></p>
</li> </li>
</ol> </ol>
</div> </div>

28
pkg/mark/testdata/links-stripnewlines.html vendored
View File

@ -1,21 +1,21 @@
Use <a href="https://example.com">https://example.com</a> <p>Use <a href="https://example.com">https://example.com</a></p>
Use <ac:rich-text-body>aaa</ac:rich-text-body> <p>Use <ac:rich-text-body>aaa</ac:rich-text-body></p>
Use <ac:link><ri:page ri:content-title="Page"/><ac:plain-text-link-body><![CDATA[page link]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="Page"/><ac:plain-text-link-body><![CDATA[page link]]></ac:plain-text-link-body></ac:link></p>
Use <ac:link><ri:page ri:content-title="AnotherPage"/><ac:plain-text-link-body><![CDATA[AnotherPage]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="AnotherPage"/><ac:plain-text-link-body><![CDATA[AnotherPage]]></ac:plain-text-link-body></ac:link></p>
Use <ac:link><ri:page ri:content-title="Another Page"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="Another Page"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link></p>
Use <ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link></p>
Use <ac:link><ri:page ri:content-title="Page With Space"/><ac:plain-text-link-body><![CDATA[page link with spaces]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="Page With Space"/><ac:plain-text-link-body><![CDATA[page link with spaces]]></ac:plain-text-link-body></ac:link></p>
<ac:image ac:alt="My Image"><ri:attachment ri:filename="test.png"/></ac:image> <p><ac:image ac:alt="My Image"><ri:attachment ri:filename="test.png"/></ac:image></p>
<ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&amp;key2=value2"/></ac:image> <p><ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&amp;key2=value2"/></ac:image></p>
<ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[My test_link]]></ac:plain-text-link-body></ac:link> <p><ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[My test_link]]></ac:plain-text-link-body></ac:link></p>
<ac:link><ri:page ri:content-title="test_link_link"/><ac:plain-text-link-body><![CDATA[Another [Link]]]></ac:plain-text-link-body></ac:link> <p><ac:link><ri:page ri:content-title="test_link_link"/><ac:plain-text-link-body><![CDATA[Another [Link]]]></ac:plain-text-link-body></ac:link></p>
Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup> <p>Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup></p>
Use <a href="foo">Link [Text]</a> <p>Use <a href="foo">Link [Text]</a></p>
<div class="footnotes" role="doc-endnotes"> <div class="footnotes" role="doc-endnotes">
<hr /> <hr />
<ol> <ol>
<li id="fn:1"> <li id="fn:1">
a footnote link&#160;<a href="#fnref:1" class="footnote-backref" role="doc-backlink">&#x21a9;&#xfe0e;</a> <p>a footnote link&#160;<a href="#fnref:1" class="footnote-backref" role="doc-backlink">&#x21a9;&#xfe0e;</a></p>
</li> </li>
</ol> </ol>
</div> </div>

28
pkg/mark/testdata/links.html vendored
View File

@ -1,21 +1,21 @@
Use <a href="https://example.com">https://example.com</a> <p>Use <a href="https://example.com">https://example.com</a></p>
Use <ac:rich-text-body>aaa</ac:rich-text-body> <p>Use <ac:rich-text-body>aaa</ac:rich-text-body></p>
Use <ac:link><ri:page ri:content-title="Page"/><ac:plain-text-link-body><![CDATA[page link]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="Page"/><ac:plain-text-link-body><![CDATA[page link]]></ac:plain-text-link-body></ac:link></p>
Use <ac:link><ri:page ri:content-title="AnotherPage"/><ac:plain-text-link-body><![CDATA[AnotherPage]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="AnotherPage"/><ac:plain-text-link-body><![CDATA[AnotherPage]]></ac:plain-text-link-body></ac:link></p>
Use <ac:link><ri:page ri:content-title="Another Page"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="Another Page"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link></p>
Use <ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[Another Page]]></ac:plain-text-link-body></ac:link></p>
Use <ac:link><ri:page ri:content-title="Page With Space"/><ac:plain-text-link-body><![CDATA[page link with spaces]]></ac:plain-text-link-body></ac:link> <p>Use <ac:link><ri:page ri:content-title="Page With Space"/><ac:plain-text-link-body><![CDATA[page link with spaces]]></ac:plain-text-link-body></ac:link></p>
<ac:image ac:alt="My Image"><ri:attachment ri:filename="test.png"/></ac:image> <p><ac:image ac:alt="My Image"><ri:attachment ri:filename="test.png"/></ac:image></p>
<ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&amp;key2=value2"/></ac:image> <p><ac:image ac:alt="My External Image"><ri:url ri:value="http://confluence.atlassian.com/images/logo/confluence_48_trans.png?key1=value1&amp;key2=value2"/></ac:image></p>
<ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[My test_link]]></ac:plain-text-link-body></ac:link> <p><ac:link><ri:page ri:content-title="test_link"/><ac:plain-text-link-body><![CDATA[My test_link]]></ac:plain-text-link-body></ac:link></p>
<ac:link><ri:page ri:content-title="test_link_link"/><ac:plain-text-link-body><![CDATA[Another [Link]]]></ac:plain-text-link-body></ac:link> <p><ac:link><ri:page ri:content-title="test_link_link"/><ac:plain-text-link-body><![CDATA[Another [Link]]]></ac:plain-text-link-body></ac:link></p>
Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup> <p>Use footnotes link <sup id="fnref:1"><a href="#fn:1" class="footnote-ref" role="doc-noteref">1</a></sup></p>
Use <a href="foo">Link [Text]</a> <p>Use <a href="foo">Link [Text]</a></p>
<div class="footnotes" role="doc-endnotes"> <div class="footnotes" role="doc-endnotes">
<hr /> <hr />
<ol> <ol>
<li id="fn:1"> <li id="fn:1">
a footnote link&#160;<a href="#fnref:1" class="footnote-backref" role="doc-backlink">&#x21a9;&#xfe0e;</a> <p>a footnote link&#160;<a href="#fnref:1" class="footnote-backref" role="doc-backlink">&#x21a9;&#xfe0e;</a></p>
</li> </li>
</ol> </ol>
</div> </div>

2
pkg/mark/testdata/lists-droph1.html vendored
View File

@ -13,7 +13,7 @@
</ul> </ul>
</li> </li>
</ul> </ul>
text <p>text</p>
<ul> <ul>
<li>a</li> <li>a</li>
<li>b</li> <li>b</li>

2
pkg/mark/testdata/lists-stripnewlines.html vendored
View File

@ -13,7 +13,7 @@
</ul> </ul>
</li> </li>
</ul> </ul>
text <p>text</p>
<ul> <ul>
<li>a</li> <li>a</li>
<li>b</li> <li>b</li>

2
pkg/mark/testdata/lists.html vendored
View File

@ -13,7 +13,7 @@
</ul> </ul>
</li> </li>
</ul> </ul>
text <p>text</p>
<ul> <ul>
<li>a</li> <li>a</li>
<li>b</li> <li>b</li>

20
pkg/mark/testdata/newlines-droph1.html vendored
View File

@ -1,10 +1,10 @@
one-1 <p>one-1
one-2 one-2</p>
two-1 <p>two-1</p>
two-2 <p>two-2</p>
three-1 <p>three-1</p>
three-2 <p>three-2</p>
space-1 <p>space-1
space-2 space-2</p>
2space-1<br /> <p>2space-1<br />
2space-2 2space-2</p>

16
pkg/mark/testdata/newlines-stripnewlines.html vendored
View File

@ -1,8 +1,8 @@
one-1 one-2 <p>one-1 one-2</p>
two-1 <p>two-1</p>
two-2 <p>two-2</p>
three-1 <p>three-1</p>
three-2 <p>three-2</p>
space-1 space-2 <p>space-1 space-2</p>
2space-1<br /> <p>2space-1<br />
2space-2 2space-2</p>

20
pkg/mark/testdata/newlines.html vendored
View File

@ -1,10 +1,10 @@
one-1 <p>one-1
one-2 one-2</p>
two-1 <p>two-1</p>
two-2 <p>two-2</p>
three-1 <p>three-1</p>
three-2 <p>three-2</p>
space-1 <p>space-1
space-2 space-2</p>
2space-1<br /> <p>2space-1<br />
2space-2 2space-2</p>

8
pkg/mark/testdata/pagelayout-droph1.html vendored
View File

@ -1,18 +1,18 @@
<ac:layout> <ac:layout>
<ac:layout-section ac:type="three_with_sidebars"> <ac:layout-section ac:type="three_with_sidebars">
<ac:layout-cell> <ac:layout-cell>
More Content <p>More Content</p>
</ac:layout-cell> </ac:layout-cell>
<ac:layout-cell> <ac:layout-cell>
More Content <p>More Content</p>
</ac:layout-cell> </ac:layout-cell>
<ac:layout-cell> <ac:layout-cell>
Even More Content <p>Even More Content</p>
</ac:layout-cell> </ac:layout-cell>
</ac:layout-section> </ac:layout-section>
<ac:layout-section ac:type="single"> <ac:layout-section ac:type="single">
<ac:layout-cell> <ac:layout-cell>
Still More Content <p>Still More Content</p>
</ac:layout-cell> </ac:layout-cell>
</ac:layout-section> </ac:layout-section>
</ac:layout> </ac:layout>

8
pkg/mark/testdata/pagelayout-stripnewlines.html vendored
View File

@ -1,18 +1,18 @@
<ac:layout> <ac:layout>
<ac:layout-section ac:type="three_with_sidebars"> <ac:layout-section ac:type="three_with_sidebars">
<ac:layout-cell> <ac:layout-cell>
More Content <p>More Content</p>
</ac:layout-cell> </ac:layout-cell>
<ac:layout-cell> <ac:layout-cell>
More Content <p>More Content</p>
</ac:layout-cell> </ac:layout-cell>
<ac:layout-cell> <ac:layout-cell>
Even More Content <p>Even More Content</p>
</ac:layout-cell> </ac:layout-cell>
</ac:layout-section> </ac:layout-section>
<ac:layout-section ac:type="single"> <ac:layout-section ac:type="single">
<ac:layout-cell> <ac:layout-cell>
Still More Content <p>Still More Content</p>
</ac:layout-cell> </ac:layout-cell>
</ac:layout-section> </ac:layout-section>
</ac:layout> </ac:layout>

8
pkg/mark/testdata/pagelayout.html vendored
View File

@ -1,18 +1,18 @@
<ac:layout> <ac:layout>
<ac:layout-section ac:type="three_with_sidebars"> <ac:layout-section ac:type="three_with_sidebars">
<ac:layout-cell> <ac:layout-cell>
More Content <p>More Content</p>
</ac:layout-cell> </ac:layout-cell>
<ac:layout-cell> <ac:layout-cell>
More Content <p>More Content</p>
</ac:layout-cell> </ac:layout-cell>
<ac:layout-cell> <ac:layout-cell>
Even More Content <p>Even More Content</p>
</ac:layout-cell> </ac:layout-cell>
</ac:layout-section> </ac:layout-section>
<ac:layout-section ac:type="single"> <ac:layout-section ac:type="single">
<ac:layout-cell> <ac:layout-cell>
Still More Content <p>Still More Content</p>
</ac:layout-cell> </ac:layout-cell>
</ac:layout-section> </ac:layout-section>
</ac:layout> </ac:layout>

14
pkg/mark/testdata/quotes-droph1.html vendored
View File

@ -1,19 +1,19 @@
<h2 id="first-heading">First Heading</h2> <h2 id="first-heading">First Heading</h2>
<ac:structured-macro ac:name="note"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body> <ac:structured-macro ac:name="note"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body>
<strong>NOTES:</strong> <p><strong>NOTES:</strong></p>
<ol> <ol>
<li>Note number one</li> <li>Note number one</li>
<li>Note number two</li> <li>Note number two</li>
</ol> </ol>
<blockquote> <blockquote>
a <p>a
b b</p>
</blockquote> </blockquote>
<strong>Warn (Should not be picked as blockquote type)</strong> <p><strong>Warn (Should not be picked as blockquote type)</strong></p>
</ac:rich-text-body></ac:structured-macro> </ac:rich-text-body></ac:structured-macro>
<h2 id="second-heading">Second Heading</h2> <h2 id="second-heading">Second Heading</h2>
<ac:structured-macro ac:name="warn"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body> <ac:structured-macro ac:name="warn"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body>
<strong>Warn</strong> <p><strong>Warn</strong></p>
<ul> <ul>
<li>Warn bullet 1</li> <li>Warn bullet 1</li>
<li>Warn bullet 2</li> <li>Warn bullet 2</li>
@ -26,9 +26,9 @@ that runs long</li>
<h2 id="third-heading">Third Heading</h2> <h2 id="third-heading">Third Heading</h2>
<ac:structured-macro ac:name="info"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body> <ac:structured-macro ac:name="info"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body>
<!-- Info --> <!-- Info -->
Test <p>Test</p>
</ac:rich-text-body></ac:structured-macro> </ac:rich-text-body></ac:structured-macro>
<h2 id="simple-blockquote">Simple Blockquote</h2> <h2 id="simple-blockquote">Simple Blockquote</h2>
<blockquote> <blockquote>
This paragraph is a simple blockquote <p>This paragraph is a simple blockquote</p>
</blockquote> </blockquote>

12
pkg/mark/testdata/quotes-stripnewlines.html vendored
View File

@ -1,19 +1,19 @@
<h1 id="main-heading">Main Heading</h1> <h1 id="main-heading">Main Heading</h1>
<h2 id="first-heading">First Heading</h2> <h2 id="first-heading">First Heading</h2>
<ac:structured-macro ac:name="note"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body> <ac:structured-macro ac:name="note"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body>
<strong>NOTES:</strong> <p><strong>NOTES:</strong></p>
<ol> <ol>
<li>Note number one</li> <li>Note number one</li>
<li>Note number two</li> <li>Note number two</li>
</ol> </ol>
<blockquote> <blockquote>
a b <p>a b</p>
</blockquote> </blockquote>
<strong>Warn (Should not be picked as blockquote type)</strong> <p><strong>Warn (Should not be picked as blockquote type)</strong></p>
</ac:rich-text-body></ac:structured-macro> </ac:rich-text-body></ac:structured-macro>
<h2 id="second-heading">Second Heading</h2> <h2 id="second-heading">Second Heading</h2>
<ac:structured-macro ac:name="warn"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body> <ac:structured-macro ac:name="warn"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body>
<strong>Warn</strong> <p><strong>Warn</strong></p>
<ul> <ul>
<li>Warn bullet 1</li> <li>Warn bullet 1</li>
<li>Warn bullet 2</li> <li>Warn bullet 2</li>
@ -25,9 +25,9 @@ a b
<h2 id="third-heading">Third Heading</h2> <h2 id="third-heading">Third Heading</h2>
<ac:structured-macro ac:name="info"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body> <ac:structured-macro ac:name="info"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body>
<!-- Info --> <!-- Info -->
Test <p>Test</p>
</ac:rich-text-body></ac:structured-macro> </ac:rich-text-body></ac:structured-macro>
<h2 id="simple-blockquote">Simple Blockquote</h2> <h2 id="simple-blockquote">Simple Blockquote</h2>
<blockquote> <blockquote>
This paragraph is a simple blockquote <p>This paragraph is a simple blockquote</p>
</blockquote> </blockquote>

14
pkg/mark/testdata/quotes.html vendored
View File

@ -1,20 +1,20 @@
<h1 id="main-heading">Main Heading</h1> <h1 id="main-heading">Main Heading</h1>
<h2 id="first-heading">First Heading</h2> <h2 id="first-heading">First Heading</h2>
<ac:structured-macro ac:name="note"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body> <ac:structured-macro ac:name="note"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body>
<strong>NOTES:</strong> <p><strong>NOTES:</strong></p>
<ol> <ol>
<li>Note number one</li> <li>Note number one</li>
<li>Note number two</li> <li>Note number two</li>
</ol> </ol>
<blockquote> <blockquote>
a <p>a
b b</p>
</blockquote> </blockquote>
<strong>Warn (Should not be picked as blockquote type)</strong> <p><strong>Warn (Should not be picked as blockquote type)</strong></p>
</ac:rich-text-body></ac:structured-macro> </ac:rich-text-body></ac:structured-macro>
<h2 id="second-heading">Second Heading</h2> <h2 id="second-heading">Second Heading</h2>
<ac:structured-macro ac:name="warn"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body> <ac:structured-macro ac:name="warn"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body>
<strong>Warn</strong> <p><strong>Warn</strong></p>
<ul> <ul>
<li>Warn bullet 1</li> <li>Warn bullet 1</li>
<li>Warn bullet 2</li> <li>Warn bullet 2</li>
@ -27,9 +27,9 @@ that runs long</li>
<h2 id="third-heading">Third Heading</h2> <h2 id="third-heading">Third Heading</h2>
<ac:structured-macro ac:name="info"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body> <ac:structured-macro ac:name="info"><ac:parameter ac:name="icon">true</ac:parameter><ac:rich-text-body>
<!-- Info --> <!-- Info -->
Test <p>Test</p>
</ac:rich-text-body></ac:structured-macro> </ac:rich-text-body></ac:structured-macro>
<h2 id="simple-blockquote">Simple Blockquote</h2> <h2 id="simple-blockquote">Simple Blockquote</h2>
<blockquote> <blockquote>
This paragraph is a simple blockquote <p>This paragraph is a simple blockquote</p>
</blockquote> </blockquote>

6
pkg/mark/testdata/tags-droph1.html vendored
View File

@ -1,6 +1,6 @@
<b>bold</b> <b>bold</b>
<strong>bold</strong> <p><strong>bold</strong></p>
<i>vitalik</i> <i>vitalik</i>
<em>vitalik</em> <p><em>vitalik</em></p>
<s>strikethrough</s> <s>strikethrough</s>
<del>strikethrough</del> <p><del>strikethrough</del></p>

9
pkg/mark/testdata/tags-stripnewlines.html vendored
View File

@ -1,3 +1,6 @@
<b>bold</b> <strong>bold</strong> <b>bold</b>
<i>vitalik</i> <em>vitalik</em> <p><strong>bold</strong></p>
<s>strikethrough</s> <del>strikethrough</del> <i>vitalik</i>
<p><em>vitalik</em></p>
<s>strikethrough</s>
<p><del>strikethrough</del></p>

6
pkg/mark/testdata/tags.html vendored
View File

@ -1,6 +1,6 @@
<b>bold</b> <b>bold</b>
<strong>bold</strong> <p><strong>bold</strong></p>
<i>vitalik</i> <i>vitalik</i>
<em>vitalik</em> <p><em>vitalik</em></p>
<s>strikethrough</s> <s>strikethrough</s>
<del>strikethrough</del> <p><del>strikethrough</del></p>

3
pkg/mark/testdata/tags.md vendored
View File

@ -1,8 +1,11 @@
<b>bold</b> <b>bold</b>
**bold** **bold**
<i>vitalik</i> <i>vitalik</i>
*vitalik* *vitalik*
<s>strikethrough</s> <s>strikethrough</s>
~~strikethrough~~ ~~strikethrough~~