[pegdown] 03/06: Merge tag 'upstream/1.6.0'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jul 20 14:33:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository pegdown.
commit 1af121b9e194b48a502a45903883ffe4f2b28b12
Merge: 2e17d9e 2c47fa5
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jul 20 16:00:48 2016 +0200
Merge tag 'upstream/1.6.0'
Upstream version 1.6.0
CHANGELOG | 29 +-
README.markdown | 13 +-
build.sbt | 4 +-
src/main/java/org/pegdown/Extensions.java | 37 +-
src/main/java/org/pegdown/LinkRenderer.java | 17 +-
src/main/java/org/pegdown/Parser.java | 603 ++++++++++++++++-----
src/main/java/org/pegdown/Printer.java | 28 +
src/main/java/org/pegdown/ToHtmlSerializer.java | 110 +++-
src/main/java/org/pegdown/ast/AnchorLinkNode.java | 5 +
src/main/java/org/pegdown/ast/HeaderNode.java | 23 +-
src/main/java/org/pegdown/ast/StrikeNode.java | 8 +-
.../java/org/pegdown/ast/StrongEmphSuperNode.java | 19 +-
.../ast/{HeaderNode.java => TaskListNode.java} | 31 +-
src/main/java/org/pegdown/ast/TextNode.java | 2 +-
.../loose-shallow-forcepara.html | 29 +
.../CompoundDefinitions/loose-shallow.html | 29 +
.../resources/CompoundDefinitions/loose-shallow.md | 50 ++
.../loose-sublist-singleitem-forcepara.html | 32 ++
.../loose-sublist-singleitem.html | 29 +
.../loose-sublist-singleitem.md | 31 ++
.../nested-one-level-forcepara.html | 44 ++
.../CompoundDefinitions/nested-one-level.html | 42 ++
.../CompoundDefinitions/nested-one-level.md | 73 +++
.../nested-two-levels-forcepara.html | 62 +++
.../CompoundDefinitions/nested-two-levels.html | 60 ++
.../CompoundDefinitions/nested-two-levels.md | 102 ++++
.../CompoundDefinitions/shallow-forcepara.html | 26 +
.../resources/CompoundDefinitions/shallow.html | 24 +
src/test/resources/CompoundDefinitions/shallow.md | 38 ++
.../CompoundLists/loose-shallow-forcepara.html | 40 ++
.../resources/CompoundLists/loose-shallow.html | 41 ++
src/test/resources/CompoundLists/loose-shallow.md | 49 ++
.../loose-sublist-singleitem-forcepara.html | 32 ++
.../CompoundLists/loose-sublist-singleitem.html | 29 +
.../CompoundLists/loose-sublist-singleitem.md | 25 +
.../CompoundLists/nested-one-level-forcepara.html | 43 ++
.../resources/CompoundLists/nested-one-level.html | 42 ++
.../resources/CompoundLists/nested-one-level.md | 64 +++
.../CompoundLists/nested-two-levels-forcepara.html | 61 +++
.../resources/CompoundLists/nested-two-levels.html | 60 ++
.../resources/CompoundLists/nested-two-levels.md | 87 +++
.../CompoundLists/plain-blockquote-forcepara.html | 3 +
.../resources/CompoundLists/plain-blockquote.html | 3 +
.../resources/CompoundLists/plain-blockquote.md | 2 +
.../CompoundLists/plain-header-forcepara.html | 1 +
src/test/resources/CompoundLists/plain-header.html | 1 +
src/test/resources/CompoundLists/plain-header.md | 1 +
.../CompoundLists/plain-para-forcepara.html | 1 +
src/test/resources/CompoundLists/plain-para.html | 1 +
src/test/resources/CompoundLists/plain-para.md | 1 +
.../plain-setext-header-forcepara.html | 1 +
.../CompoundLists/plain-setext-header.html | 1 +
.../resources/CompoundLists/plain-setext-header.md | 2 +
.../resources/CompoundLists/shallow-forcepara.html | 25 +
src/test/resources/CompoundLists/shallow.html | 24 +
src/test/resources/CompoundLists/shallow.md | 38 ++
.../Ordered and unordered lists.html | 199 ++++---
src/test/resources/Maruku/alt.html | 2 +
src/test/resources/Maruku/alt.md | 2 +-
src/test/resources/Maruku/list1.html | 32 +-
src/test/resources/Maruku/list1.md | 17 +
.../OptionalExtensions/escaped-chars-all-ext.html | 1 +
.../OptionalExtensions/escaped-chars-no-ext.html | 1 +
.../resources/OptionalExtensions/escaped-chars.md | 1 +
.../OptionalExtensions/extanchors-ext.ast | 45 ++
.../OptionalExtensions/extanchors-ext.html | 3 +
.../OptionalExtensions/extanchors-no-ext.ast | 41 ++
.../OptionalExtensions/extanchors-no-ext.html | 4 +
.../resources/OptionalExtensions/extanchors.md | 8 +
.../OptionalExtensions/header-space-ext.html | 6 +
.../OptionalExtensions/header-space-ext.md | 23 +
.../OptionalExtensions/hrules-not-relaxed.ast | 34 ++
.../OptionalExtensions/hrules-not-relaxed.html | 6 +
.../OptionalExtensions/hrules-relaxed.ast | 17 +
.../OptionalExtensions/hrules-relaxed.html | 11 +
src/test/resources/OptionalExtensions/hrules.md | 14 +
.../OptionalExtensions/no-blank-hrules.md | 5 +
.../OptionalExtensions/no-header-space-ext.html | 12 +
.../OptionalExtensions/no-header-space-ext.md | 24 +
.../OptionalExtensions/setext-headers.html | 2 +
.../resources/OptionalExtensions/setext-headers.md | 5 +
.../OptionalExtensions/task-lists-ext.ast | 44 ++
.../OptionalExtensions/task-lists-ext.html | 25 +
.../OptionalExtensions/task-lists-no-ext.ast | 62 +++
.../OptionalExtensions/task-lists-no-ext.html | 24 +
.../resources/OptionalExtensions/task-lists.md | 19 +
.../PhpMarkdown/Code_block_in_a_list_item.html | 11 +-
.../PhpMarkdownExtra/Fenced_Code_Blocks.html | 3 +
.../PhpMarkdownExtra/Fenced_Code_Blocks.md | 7 +-
src/test/resources/PhpMarkdownExtra/Tables.html | 23 +-
src/test/resources/PhpMarkdownExtra/Tables.md | 7 +
src/test/resources/Tables/crazy-table.md | 52 ++
src/test/resources/pegdown/AstText.ast | 223 ++++----
src/test/resources/pegdown/AstText.md | 40 +-
.../resources/pegdown/GFM_Fenced_Code_Blocks.ast | 12 +-
.../resources/pegdown/GFM_Fenced_Code_Blocks.html | 12 +
.../resources/pegdown/GFM_Fenced_Code_Blocks.md | 18 +-
.../GFM_Fenced_Code_Blocks_reversed_all.html | 19 +
.../GFM_Fenced_Code_Blocks_reversed_scala.html | 13 +
src/test/resources/pegdown/HTML5 Blocks.ast | 3 +
src/test/resources/pegdown/HTML5 Blocks.md | 6 +
src/test/resources/pegdown/Wikilinks.html | 4 +-
src/test/resources/pegdown/Wikilinks.md | 3 +
.../scala/org/pegdown/AbstractPegDownSpec.scala | 19 +-
src/test/scala/org/pegdown/CompoundListsSpec.scala | 89 +++
.../scala/org/pegdown/OptionalExtensionsSpec.scala | 85 +++
src/test/scala/org/pegdown/PegDownSpec.scala | 1 +
src/test/scala/org/pegdown/PhpMarkdownSpec.scala | 2 +-
108 files changed, 3184 insertions(+), 435 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pegdown.git
More information about the pkg-java-commits
mailing list