[epubcheck] 02/02: Merge tag 'upstream/4.0.2'

[Eugene Zhukov]

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

eugene pushed a commit to branch master
in repository epubcheck.

commit 49f8f09dbc0871030380edb85fdd8c858f8cf4fd
Merge: 33c733c 5124394
Author: Eugene Zhukov <eugene at debian.org>
Date:   Sun Feb 5 08:23:43 2017 +0200

    Merge tag 'upstream/4.0.2'
    
    Upstream version 4.0.2

 README.md                                          |   8 +-
 pom.xml                                            |   5 +-
 .../com/adobe/epubcheck/bitmap/BitmapChecker.java  |   3 +-
 .../java/com/adobe/epubcheck/css/CSSChecker.java   |   5 +-
 .../java/com/adobe/epubcheck/ctc/EntitySearch.java |   6 +-
 .../epubcheck/ctc/EpubHTML5StructureCheck.java     |   6 +-
 .../adobe/epubcheck/ctc/EpubRenditionCheck.java    |   1 -
 .../com/adobe/epubcheck/ctc/EpubScriptCheck.java   |   3 +-
 .../java/com/adobe/epubcheck/ctc/XmlDocParser.java |   4 +
 .../epubcheck/ctc/css/EpubCSSCheckCSSHandler.java  |   9 +-
 .../ctc/xml/CSSStyleAttributeHandler.java          |   3 +-
 .../epubcheck/ctc/xml/HTMLTagsAnalyseHandler.java  |   5 +-
 .../adobe/epubcheck/ctc/xml/ScriptTagHandler.java  |   5 +-
 .../epubcheck/ctc/xml/XMLContentDocParser.java     |   3 +-
 .../epubcheck/messages/MessageDictionary.java      |   2 +-
 .../java/com/adobe/epubcheck/opf/OPFPeeker.java    |   2 +
 .../adobe/epubcheck/opf/ResourceCollection.java    |   5 +-
 .../com/adobe/epubcheck/opf/VersionRetriever.java  |  29 ++-
 .../java/com/adobe/epubcheck/ops/OPSHandler.java   |   5 +-
 .../java/com/adobe/epubcheck/ops/OPSHandler30.java |   3 +-
 .../java/com/adobe/epubcheck/tool/EpubChecker.java |   5 +-
 .../java/com/adobe/epubcheck/util/Archive.java     |   7 +
 .../java/com/adobe/epubcheck/util/URISchemes.java  |   4 +-
 .../adobe/epubcheck/util/XmlReportAbstract.java    | 267 +++++++++++++++------
 .../com/adobe/epubcheck/util/XmlReportImpl.java    | 201 ++++++++--------
 .../com/adobe/epubcheck/util/XmpReportImpl.java    | 159 ++++++------
 .../java/com/adobe/epubcheck/vocab/EnumVocab.java  |   3 +-
 .../java/com/adobe/epubcheck/xml/XMLParser.java    |   6 +-
 .../java/com/adobe/epubcheck/xml/XMLValidator.java |  31 +--
 .../org/idpf/epubcheck/util/css/CssGrammar.java    |   5 +-
 .../epubcheck/messages/MessageBundle.properties    |   2 +-
 .../epubcheck/api/Epub30CheckExpandedTest.java     |   7 +
 .../com/adobe/epubcheck/stress/StressTest.java     |   2 -
 .../epubcheck/test/OutputDifferenceListener.java   |  21 +-
 src/test/java/com/adobe/epubcheck/test/common.java |  63 ++++-
 src/test/java/com/adobe/epubcheck/test/debug.java  |   7 -
 .../com/adobe/epubcheck/test/encryption_Test.java  |  44 ++++
 .../epubcheck/util/css/CssInputStreamTest.java     |   4 -
 .../30/expanded/valid/page-list/EPUB/lorem.opf     |  16 ++
 .../30/expanded/valid/page-list/EPUB/lorem.xhtml   |  34 +++
 .../valid/page-list/META-INF/container.xml         |   7 +
 .../resources/30/expanded/valid/page-list/mimetype |   1 +
 .../test/DTBook/Basic_expected_results.xml         |  14 +-
 .../listSeverities_expected_results.txt            |   2 +-
 .../test/command_line/xmlfile_expected_results.xml |  40 +--
 .../test/css/discouraged_expected_results.xml      | 156 ++++++------
 .../css/font_encryption_idpf_expected_results.xml  | 104 ++++----
 .../epub20_encryption_binary_content.epub          | Bin 0 -> 411978 bytes
 ...yption_binary_content.epub_expected_results.xml |  85 +++++++
 .../test/encryption/epub20_minimal_encryption.epub | Bin 0 -> 376714 bytes
 ...20_minimal_encryption.epub_expected_results.xml |  83 +++++++
 .../test/encryption/epub30_font_obfuscation.epub   | Bin 0 -> 744046 bytes
 ...ub30_font_obfuscation.epub_expected_results.xml | 162 +++++++++++++
 ...ub30_font_obfuscation.epub_expected_results.xmp |  66 +++++
 .../test/opf/Epub2_marked_v3_expected_results.xml  |  19 +-
 .../test/opf/Epub3_marked_v2_expected_results.xml  |  27 ++-
 .../opf/Missing_Spine_epub3_expected_results.xml   |  16 +-
 ...Publication_Metadata_epub3_expected_results.xml |  13 +-
 .../interesting_paths_epub2_expected_results.xml   |  17 +-
 .../interesting_paths_epub3_expected_results.xml   |  52 ++--
 .../epubcheck/test/xhtml/dtd_expected_results.json |  22 +-
 61 files changed, 1351 insertions(+), 535 deletions(-)

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