[pegdown] 01/02: Merge tag 'upstream/1.5.0'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository pegdown.

commit 8ed2470184bff868a27735bf38948336e5d73cf6
Merge: e01eb8f 381929d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 19 14:28:06 2015 +0100

    Merge tag 'upstream/1.5.0'
    
    Upstream version 1.5.0

 .gitignore                                         | 38 +++++++--
 CHANGELOG                                          | 12 ++-
 README.markdown                                    |  2 +-
 build.sbt                                          | 18 ++--
 pegdown.iml                                        | 95 ----------------------
 project/build.properties                           |  2 +-
 project/plugins.sbt                                |  2 +-
 src/main/java/org/pegdown/Extensions.java          |  5 ++
 src/main/java/org/pegdown/LinkRenderer.java        | 17 ++--
 src/main/java/org/pegdown/Parser.java              | 24 +++++-
 src/main/java/org/pegdown/PegDownProcessor.java    | 16 +++-
 src/main/java/org/pegdown/ToHtmlSerializer.java    | 10 ++-
 src/main/java/org/pegdown/ast/AnchorLinkNode.java  | 51 ++++++++++++
 src/main/java/org/pegdown/ast/Visitor.java         |  1 +
 .../java/org/pegdown/plugins/PegDownPlugins.java   | 23 ++++--
 src/test/resources/pegdown/AnchorLinks.html        |  5 ++
 src/test/resources/pegdown/AnchorLinks.md          | 10 +++
 src/test/resources/pegdown/AstText.ast             |  2 +-
 src/test/resources/pegdown/Autolinks.html          |  2 +-
 src/test/resources/pegdown/Linebreaks.html         |  2 +-
 src/test/resources/pegdown/Smartypants.html        |  2 +-
 src/test/resources/pegdown/Strikethrough.html      |  2 +-
 src/test/resources/pegdown/Tables.html             |  2 +-
 src/test/resources/pegdown/Wikilinks.html          |  5 +-
 src/test/resources/pegdown/Wikilinks.md            |  3 +-
 .../scala/org/pegdown/AbstractPegDownSpec.scala    | 10 ++-
 src/test/scala/org/pegdown/EmphStrongSpec.scala    |  2 +-
 src/test/scala/org/pegdown/Markdown103Spec.scala   |  4 +-
 src/test/scala/org/pegdown/MarukuSpec.scala        |  2 +-
 .../scala/org/pegdown/PathologicalInputSpec.scala  |  7 ++
 src/test/scala/org/pegdown/PegDownSpec.scala       |  5 +-
 src/test/scala/org/pegdown/PhpMarkdownSpec.scala   |  2 +-
 32 files changed, 230 insertions(+), 153 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pegdown.git