Commit 44f44526 authored by Stephan Kreutzer's avatar Stephan Kreutzer
Browse files

xml_dtd_entity_resolver_1: Support for XHTML 1.1 via resolving actual DTDs.

parent 9044fea3
......@@ -84,6 +84,7 @@ public class setup_1
CopyEntitiesXHTML_1_0_Strict(programPath, ".." + File.separator + ".." + File.separator + ".." + File.separator + "xml_dtd_entity_resolver" + File.separator + "xml_dtd_entity_resolver_1" + File.separator + "entities");
CopyEntitiesXHTML_1_1(programPath, ".." + File.separator + ".." + File.separator + ".." + File.separator + "xml_xslt_transformator" + File.separator + "xml_xslt_transformator_1" + File.separator + "entities");
CopyEntitiesXHTML_1_1(programPath, ".." + File.separator + ".." + File.separator + ".." + File.separator + "xml_dtd_entity_resolver" + File.separator + "xml_dtd_entity_resolver_1" + File.separator + "entities");
CopyEntitiesUnicode(programPath, ".." + File.separator + ".." + File.separator + ".." + File.separator + "xml_xslt_transformator" + File.separator + "xml_xslt_transformator_1" + File.separator + "entities");
CopyEntitiesUnicode(programPath, ".." + File.separator + ".." + File.separator + ".." + File.separator + "onix_prepare_for_json" + File.separator + "onix_prepare_for_json_1" + File.separator + "entities");
......
/* Copyright (C) 2014-2018 Stephan Kreutzer
/* Copyright (C) 2014-2019 Stephan Kreutzer
*
* This file is part of xml_concatenator_1, a submodule of the
* digital_publishing_workflow_tools package.
......@@ -58,7 +58,7 @@ public class xml_concatenator_1
{
public static void main(String args[])
{
System.out.print("xml_concatenator_1 Copyright (C) 2014-2018 Stephan Kreutzer\n" +
System.out.print("xml_concatenator_1 Copyright (C) 2014-2019 Stephan Kreutzer\n" +
"This program comes with ABSOLUTELY NO WARRANTY.\n" +
"This is free software, and you are welcome to redistribute it\n" +
"under certain conditions. See the GNU Affero General Public License 3\n" +
......@@ -494,6 +494,12 @@ public class xml_concatenator_1
try
{
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
// This is a concatenator for generic XML, don't want to deal with legacy DTD
// remnants. Consider using $/xml_dtd_entity_resolver/xml_dtd_entity_resolver_1.
inputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
inputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
InputStream in = new FileInputStream(inputFile);
XMLEventReader eventReader = inputFactory.createXMLEventReader(in);
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2014-2019 Stephan Kreutzer
This file is part of xml_dtd_entity_resolver_1, a submodule of the
digital_publishing_workflow_tools package.
xml_dtd_entity_resolver_1 is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License version 3 or any later version,
as published by the Free Software Foundation.
xml_dtd_entity_resolver_1 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License 3 for more details.
You should have received a copy of the GNU Affero General Public License 3
along with xml_dtd_entity_resolver_1. If not, see <http://www.gnu.org/licenses/>.
-->
<xml-dtd-entity-resolver-1-entity-resolver-config>
<entity>
<resolve identifier="-//W3C//DTD XHTML 1.1//EN" reference="./org.w3c/xhtml_1_1/xhtml11.dtd"/>
<resolve identifier="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" reference="./org.w3c/xhtml_1_1/xhtml11.dtd"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Inline Style 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-inlstyle-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-inlstyle-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-inlstyle-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ENTITIES XHTML Datatypes 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-datatypes-1.mod"/>
<resolve identifier="xhtml-datatypes-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-datatypes-1.mod"/>
<resolve identifier="http://www.w3.org/TR/xhtml11/DTD/xhtml-datatypes-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-datatypes-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ENTITIES XHTML Modular Framework 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-framework-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-framework-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-framework-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ENTITIES XHTML Qualified Names 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-qname-1.mod"/>
<resolve identifier="xhtml-qname-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-qname-1.mod"/>
<resolve identifier="http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-qname-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-events-1.mod"/>
<resolve identifier="xhtml-events-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-events-1.mod"/>
<resolve identifier="http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-events-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-events-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ENTITIES XHTML Common Attributes 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-attribs-1.mod"/>
<resolve identifier="xhtml-attribs-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-attribs-1.mod"/>
<resolve identifier="http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-attribs-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml11-model-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml11-model-1.mod" reference="./org.w3c/xhtml_1_1/xhtml11-model-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ENTITIES XHTML Character Entities 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-charent-1.mod"/>
<resolve identifier="xhtml-charent-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-charent-1.mod"/>
<resolve identifier="http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-charent-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ENTITIES Latin 1 for XHTML//EN" reference="./org.w3c/xhtml_1_1/xhtml-lat1.ent"/>
<resolve identifier="xhtml-lat1.ent" reference="./org.w3c/xhtml_1_1/xhtml-lat1.ent"/>
<resolve identifier="http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent" reference="./org.w3c/xhtml_1_1/xhtml-lat1.ent"/>
</entity>
<entity>
<resolve identifier="-//W3C//ENTITIES Symbols for XHTML//EN" reference="./org.w3c/xhtml_1_1/xhtml-symbol.ent"/>
<resolve identifier="xhtml-symbol.ent" reference="./org.w3c/xhtml_1_1/xhtml-symbol.ent"/>
<resolve identifier="http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent" reference="./org.w3c/xhtml_1_1/xhtml-symbol.ent"/>
</entity>
<entity>
<resolve identifier="-//W3C//ENTITIES Special for XHTML//EN" reference="./org.w3c/xhtml_1_1/xhtml-special.ent"/>
<resolve identifier="xhtml-special.ent" reference="./org.w3c/xhtml_1_1/xhtml-special.ent"/>
<resolve identifier="http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent" reference="./org.w3c/xhtml_1_1/xhtml-special.ent"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Text 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-text-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-text-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-text-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-inlstruct-1.mod"/>
<resolve identifier="xhtml-inlstruct-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-inlstruct-1.mod"/>
<resolve identifier="http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-inlstruct-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-inlphras-1.mod"/>
<resolve identifier="xhtml-inlphras-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-inlphras-1.mod"/>
<resolve identifier="http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-inlphras-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Block Structural 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-blkstruct-1.mod"/>
<resolve identifier="xhtml-blkstruct-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-blkstruct-1.mod"/>
<resolve identifier="http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-blkstruct-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-blkphras-1.mod"/>
<resolve identifier="xhtml-blkphras-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-blkphras-1.mod"/>
<resolve identifier="http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-blkphras-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Hypertext 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-hypertext-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-hypertext-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-hypertext-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Lists 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-list-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-list-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-list-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Editing Elements 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-edit-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-edit-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-edit-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML BIDI Override Element 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-bdo-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-bdo-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-bdo-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Ruby 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-ruby-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-ruby-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-ruby-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Presentation 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-pres-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-pres-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-pres-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-inlpres-1.mod"/>
<resolve identifier="xhtml-inlpres-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-inlpres-1.mod"/>
<resolve identifier="http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-inlpres-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-blkpres-1.mod"/>
<resolve identifier="xhtml-blkpres-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-blkpres-1.mod"/>
<resolve identifier="http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-blkpres-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Link Element 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-link-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-link-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-link-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Metainformation 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-meta-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-meta-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-meta-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Base Element 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-base-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-base-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-base-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Scripting 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-script-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-script-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-script-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-style-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-style-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-style-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Images 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-image-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-image-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-image-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-csismap-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-csismap-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-csismap-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-ssismap-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-ssismap-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-ssismap-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Param Element 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-param-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-param-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-param-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-object-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-object-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-object-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Tables 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-table-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-table-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-table-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Forms 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-form-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-form-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-form-1.mod"/>
</entity>
<entity>
<resolve identifier="-//W3C//ELEMENTS XHTML Document Structure 1.0//EN" reference="./org.w3c/xhtml_1_1/xhtml-struct-1.mod"/>
<resolve identifier="http://www.w3.org/MarkUp/DTD/xhtml-struct-1.mod" reference="./org.w3c/xhtml_1_1/xhtml-struct-1.mod"/>
</entity>
</xml-dtd-entity-resolver-1-entity-resolver-config>
......@@ -5,17 +5,17 @@ Copyright (C) 2014-2019 Stephan Kreutzer
This file is part of xml_xslt_transformator_1, a submodule of the
digital_publishing_workflow_tools package.
ml_xslt_transformator_1 is free software: you can redistribute it and/or modify
xml_xslt_transformator_1 is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License version 3 or any later version,
as published by the Free Software Foundation.
ml_xslt_transformator_1 is distributed in the hope that it will be useful,
xml_xslt_transformator_1 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License 3 for more details.
You should have received a copy of the GNU Affero General Public License 3
along with ml_xslt_transformator_1. If not, see <http://www.gnu.org/licenses/>.
along with xml_xslt_transformator_1. If not, see <http://www.gnu.org/licenses/>.
-->
<xml-xslt-transformator-1-entity-resolver-config>
<entity>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment