This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository doxia.
commit 4c872b8f1a2ce7e61dc3fb2c5ebbe9cc2e9cd795 Merge: 731452b 1242ecd Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 27 20:58:16 2017 +0200 Updated version 1.4 from 'upstream/1.4' with Debian dir 38f5007ae39f72a849803e260b9ac0a5ef8f462d .gitignore | 14 + doxia-core/pom.xml | 7 +- .../java/org/apache/maven/doxia/DefaultDoxia.java | 8 +- .../org/apache/maven/doxia/index/IndexEntry.java | 32 +- .../org/apache/maven/doxia/macro/EchoMacro.java | 5 +- .../org/apache/maven/doxia/macro/SwfMacro.java | 18 +- .../doxia/macro/manager/DefaultMacroManager.java | 8 +- .../maven/doxia/macro/snippet/SnippetMacro.java | 90 +++- .../org/apache/maven/doxia/macro/toc/TocMacro.java | 7 +- .../site/manager/DefaultSiteModuleManager.java | 10 +- .../apache/maven/doxia/parser/AbstractParser.java | 8 +- .../maven/doxia/parser/AbstractXmlParser.java | 26 +- .../apache/maven/doxia/parser/XhtmlBaseParser.java | 315 +++++++++++- .../doxia/parser/manager/DefaultParserManager.java | 10 +- .../apache/maven/doxia/sink/AbstractXmlSink.java | 18 +- .../maven/doxia/sink/SinkEventAttributeSet.java | 4 +- .../org/apache/maven/doxia/sink/XhtmlBaseSink.java | 8 +- .../org/apache/maven/doxia/util/LineBreaker.java | 8 +- .../org/apache/maven/doxia/AbstractModuleTest.java | 35 +- .../org/apache/maven/doxia/macro/SwfMacroTest.java | 49 ++ .../doxia/macro/snippet/SnippetMacroTest.java | 41 +- .../maven/doxia/module/AbstractIdentityTest.java | 7 +- .../maven/doxia/parser/AbstractParserTest.java | 28 +- .../maven/doxia/parser/XhtmlBaseParserTest.java | 453 ++++++++++------- .../apache/maven/doxia/sink/AbstractSinkTest.java | 75 ++- .../maven/doxia/sink/AbstractXmlSinkTest.java | 6 +- .../apache/maven/doxia/sink/XhtmlBaseSinkTest.java | 51 +- .../maven/doxia/xsd/AbstractXmlValidator.java | 2 +- doxia-core/src/test/resources/test.xhtml | 30 ++ doxia-logging-api/pom.xml | 3 +- .../java/org/apache/maven/doxia/logging/Log.java | 4 +- doxia-modules/doxia-module-apt/pom.xml | 25 +- .../apache/maven/doxia/module/apt/AptParser.java | 47 +- .../maven/doxia/module/apt/AptReaderSource.java | 23 +- .../org/apache/maven/doxia/module/apt/AptSink.java | 14 +- .../maven/doxia/module/apt/AptSinkFactory.java | 6 +- .../maven/doxia/module/apt/AptSiteModule.java | 6 +- .../apache/maven/doxia/module/apt/AptUtils.java | 6 +- .../META-INF/plexus}/components.xml | 0 .../maven/doxia/module/apt/AptParserTest.java | 550 +++++++-------------- .../apache/maven/doxia/module/apt/AptSinkTest.java | 10 +- doxia-modules/doxia-module-confluence/pom.xml | 3 +- .../doxia/module/confluence/ConfluenceMarkup.java | 38 +- .../doxia/module/confluence/ConfluenceParser.java | 10 +- .../doxia/module/confluence/ConfluenceSink.java | 45 +- .../module/confluence/ConfluenceSinkFactory.java | 6 +- .../module/confluence/ConfluenceSiteModule.java | 6 +- .../confluence/parser/ChildBlocksBuilder.java | 151 +++++- .../parser/DefinitionListBlockParser.java | 8 +- .../confluence/parser/FigureBlockParser.java | 8 +- .../confluence/parser/LinethroughBlock.java} | 87 ++-- .../confluence/parser/ParagraphBlockParser.java | 8 +- .../doxia/module/confluence/parser/SubBlock.java} | 87 ++-- .../doxia/module/confluence/parser/SupBlock.java} | 87 ++-- .../module/confluence/parser/UnderlineBlock.java} | 87 ++-- .../confluence/parser/VerbatimBlockParser.java | 4 +- .../confluence/parser/list/ListBlockParser.java | 6 +- .../confluence/parser/list/TreeComponent.java | 4 +- .../confluence/parser/table/TableBlockParser.java | 4 +- .../module/confluence/ConfluenceParserTest.java | 158 +++++- .../module/confluence/ConfluenceSinkTest.java | 33 +- .../src/test/resources/escapes.confluence | 13 +- .../src/test/resources/link.confluence | 14 +- .../src/test/resources/simple-list.confluence | 27 +- doxia-modules/doxia-module-docbook-simple/pom.xml | 25 +- .../maven/doxia/module/docbook/DocBookParser.java | 6 +- .../maven/doxia/module/docbook/DocBookSink.java | 4 +- .../doxia/module/docbook/DocBookSiteModule.java | 6 +- .../doxia/module/docbook/DocbookSinkFactory.java | 6 +- .../META-INF/plexus}/components.xml | 0 .../doxia/module/docbook/DocBookSinkTest.java | 14 +- doxia-modules/doxia-module-fml/pom.xml | 20 +- .../apache/maven/doxia/module/fml/FmlParser.java | 16 +- .../maven/doxia/module/fml/FmlSiteModule.java | 6 +- .../META-INF/plexus}/components.xml | 0 doxia-modules/doxia-module-fo/pom.xml | 9 +- .../maven/doxia/module/fo/FoAggregateSink.java | 180 ++++--- .../maven/doxia/module/fo/FoConfiguration.java | 4 +- .../org/apache/maven/doxia/module/fo/FoSink.java | 16 +- .../maven/doxia/module/fo/FoSinkFactory.java | 6 +- .../maven/doxia/module/fo/FoAggregateSinkTest.java | 67 ++- .../apache/maven/doxia/module/fo/FoSinkTest.java | 20 +- doxia-modules/doxia-module-itext/pom.xml | 3 +- .../apache/maven/doxia/module/itext/ITextFont.java | 4 +- .../maven/doxia/module/itext/ITextHeader.java | 6 +- .../apache/maven/doxia/module/itext/ITextSink.java | 6 +- .../maven/doxia/module/itext/ITextSinkFactory.java | 6 +- .../doxia/module/itext/SinkActionContext.java | 4 +- doxia-modules/doxia-module-latex/pom.xml | 3 +- .../apache/maven/doxia/module/latex/LatexSink.java | 6 +- .../maven/doxia/module/latex/LatexSinkFactory.java | 6 +- .../maven/doxia/module/latex/LatexSinkTest.java | 12 +- doxia-modules/doxia-module-markdown/pom.xml | 129 +++-- .../doxia/module/markdown/MarkdownParser.java | 4 +- .../doxia/module/markdown/MarkdownSiteModule.java | 4 +- .../markdown/MarkdownToDoxiaHtmlSerializer.java | 17 +- .../doxia-module-markdown/src/site/apt/index.apt | 3 + .../doxia/module/markdown/MarkdownParserTest.java | 110 ++--- .../src/test/resources/test.md | 12 +- doxia-modules/doxia-module-rtf/pom.xml | 4 +- .../maven/doxia/module/rtf/AlphaNumerals.java | 4 +- .../apache/maven/doxia/module/rtf/FontMetrics.java | 4 +- .../apache/maven/doxia/module/rtf/PBMReader.java | 4 +- .../maven/doxia/module/rtf/RomanNumerals.java | 4 +- .../org/apache/maven/doxia/module/rtf/RtfSink.java | 22 +- .../maven/doxia/module/rtf/RtfSinkFactory.java | 6 +- doxia-modules/doxia-module-twiki/pom.xml | 3 +- .../maven/doxia/module/twiki/TWikiParser.java | 6 +- .../apache/maven/doxia/module/twiki/TWikiSink.java | 6 +- .../maven/doxia/module/twiki/TWikiSinkFactory.java | 6 +- .../maven/doxia/module/twiki/TWikiSiteModule.java | 6 +- .../twiki/parser/GenericListBlockParser.java | 8 +- .../module/twiki/parser/ParagraphBlockParser.java | 8 +- .../doxia/module/twiki/parser/SectionBlock.java | 4 +- .../doxia/module/twiki/parser/TextParser.java | 5 +- .../maven/doxia/module/twiki/TWikiSinkTest.java | 10 +- .../doxia/module/twiki/parser/TwikiParserTest.java | 45 +- .../doxia/module/twiki/parser/VerbatimTest.java | 11 +- .../maven/doxia/module/twiki/parser/WordsTest.java | 66 +-- doxia-modules/doxia-module-xdoc/pom.xml | 20 +- .../apache/maven/doxia/module/xdoc/XdocParser.java | 79 ++- .../maven/doxia/module/xdoc/XdocSinkFactory.java | 6 +- .../maven/doxia/module/xdoc/XdocSiteModule.java | 6 +- .../META-INF/plexus}/components.xml | 0 .../maven/doxia/module/xdoc/XdocIdentityTest.java | 6 +- .../maven/doxia/module/xdoc/XdocParserTest.java | 240 ++++----- .../maven/doxia/module/xdoc/XdocSinkTest.java | 24 +- .../doxia/module/xdoc/XmlWriterXdocSinkTest.java | 14 +- doxia-modules/doxia-module-xhtml/pom.xml | 3 +- .../maven/doxia/module/xhtml/XhtmlParser.java | 8 +- .../maven/doxia/module/xhtml/XhtmlSinkFactory.java | 6 +- .../maven/doxia/module/xhtml/XhtmlSiteModule.java | 6 +- .../doxia/module/xhtml/XhtmlIdentityTest.java | 6 +- .../maven/doxia/module/xhtml/XhtmlSinkTest.java | 51 +- doxia-modules/pom.xml | 7 +- doxia-sink-api/pom.xml | 3 +- doxia-test-docs/pom.xml | 3 +- pom.xml | 86 ++-- src/site/site.xml | 2 +- src/site/xdoc/index.xml | 2 +- 140 files changed, 2747 insertions(+), 1764 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
