diff options
Diffstat (limited to 'BKUViewer')
4 files changed, 29 insertions, 5 deletions
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-modules-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-modules-1.xsd index 4c73cf2a..b5d779a9 100644 --- a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-modules-1.xsd +++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-modules-1.xsd @@ -27,6 +27,10 @@ <!-- Changes to common attributes module --> <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> + <xs:include schemaLocation="xhtml-attribs-1.xsd"/> + + <!-- WORKAROUND to [#422] Get rid of Xerces 2.9.1 dependency (SLXHTML validation) + | <xs:redefine schemaLocation="xhtml-attribs-1.xsd"> <xs:attributeGroup name="xhtml.I18n.attrib"> @@ -47,13 +51,19 @@ </xs:attributeGroup> </xs:redefine> + |--> <xs:include schemaLocation="xhtml-framework-1.xsd"/> <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> <!-- Changes to block phrasal elements module --> <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> - + + <xs:include schemaLocation="xhtml-blkphras-1.xsd"/> + + <!-- WORKAROUND to [#422] Get rid of Xerces 2.9.1 dependency (SLXHTML validation) + | xercesImpl < 2.9.1 cannot handle redefinition here while schema is included elsewhere without redefinition + | <xs:redefine schemaLocation="xhtml-blkphras-1.xsd"> <xs:attributeGroup name="xhtml.blockquote.attlist"> @@ -66,7 +76,8 @@ </xs:attributeGroup> </xs:redefine> - + |--> + <xs:include schemaLocation="xhtml-text-1.xsd"/> <xs:include schemaLocation="xhtml-list-1.xsd"/> diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml.xsd index 555edb52..1a6bae4a 100644 --- a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml.xsd +++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml.xsd @@ -1,3 +1,11 @@ +<!--
+ |
+ | Important note:
+ | WORKAROUND to [#422] Get rid of Xerces 2.9.1 dependency (SLXHTML validation)
+ | requires changes to xhtml-attribs-1.xsd and xhtml-blkphras-1.xsd,
+ | when updating the xhtml schema make sure to re-incorporate the respective changes!
+ |
+-->
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema targetNamespace="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:xs="http://www.w3.org/2001/XMLSchema" blockDefault="#all">
<xs:annotation>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-attribs-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-attribs-1.xsd index bbe42e1d..43fddc22 100644 --- a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-attribs-1.xsd +++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-attribs-1.xsd @@ -33,7 +33,9 @@ <xs:attribute name="class" type="xs:NMTOKENS"/> </xs:attributeGroup> <xs:attributeGroup name="xhtml.title"> - <xs:attribute name="title" type="xs:string"/> + <!-- WORKAROUND to [#422] Get rid of Xerces 2.9.1 dependency (SLXHTML validation) + | + <xs:attribute name="title" type="xs:string"/> --> </xs:attributeGroup> <xs:attributeGroup name="xhtml.Core.attrib"> <xs:attribute ref="xml:space"/> @@ -43,7 +45,9 @@ <xs:attributeGroup ref="xhtml.Core.extra.attrib"/> </xs:attributeGroup> <xs:attributeGroup name="xhtml.I18n.attrib"> - <xs:attribute ref="xml:lang" /> + <!-- WORKAROUND to [#422] Get rid of Xerces 2.9.1 dependency (SLXHTML validation) + | + <xs:attribute ref="xml:lang" /> --> <xs:attributeGroup ref="xhtml.I18n.extra.attrib"/> </xs:attributeGroup> <xs:attributeGroup name="xhtml.Common.attrib"> diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkphras-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkphras-1.xsd index 89938b4c..7e902568 100644 --- a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkphras-1.xsd +++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkphras-1.xsd @@ -53,7 +53,8 @@ <!-- blockquote --> <xs:attributeGroup name="xhtml.blockquote.attlist"> <xs:attributeGroup ref="xhtml.Common.attrib"/> - <xs:attribute name="cite" type="xh11d:URI"/> + <!-- WORKAROUND to [#422] Get rid of Xerces 2.9.1 dependency (SLXHTML validation) + <xs:attribute name="cite" type="xh11d:URI"/> --> </xs:attributeGroup> <xs:group name="xhtml.blockquote.content"> <xs:sequence> |