summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/slxhtml-modules-1.xsd4
-rw-r--r--BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-attribs-1.xsd3
-rw-r--r--BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-blkphras-1.xsd3
-rw-r--r--BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-datatypes-1.xsd20
-rw-r--r--BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-struct-1.xsd18
5 files changed, 32 insertions, 16 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 016833be..4c73cf2a 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
@@ -66,7 +66,7 @@
</xs:attributeGroup>
</xs:redefine>
-
+
<xs:include schemaLocation="xhtml-text-1.xsd"/>
<xs:include schemaLocation="xhtml-list-1.xsd"/>
@@ -83,7 +83,7 @@
Redefinition by SLXHTML 1.2: Change value of the version attrib.
</xs:documentation>
</xs:annotation>
- <xs:attribute name="version" type="xh11d:FPI" fixed="-//www.buergerkarte.at//DOCUMENT SLXHTML 1.2//DE"/>
+ <xs:attribute name="version" type="xh11d:CDATA" fixed="-//www.buergerkarte.at//DOCUMENT SLXHTML 1.2//DE"/>
</xs:attributeGroup>
<xs:attributeGroup name="xhtml.profile.attrib">
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 df5ce483..bbe42e1d 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
@@ -10,7 +10,7 @@
<xs:annotation>
<xs:documentation>
This is the XML Schema common attributes module for XHTML
- $Id: xhtml-attribs-1.xsd,v 1.6 2005/09/26 23:37:47 ahby Exp $
+ $Id: xhtml-attribs-1.xsd,v 1.7 2008/07/05 04:11:00 ahby Exp $
</xs:documentation>
<xs:documentation source="xhtml-copyright-1.xsd"/>
<xs:documentation source="http://www.w3.org/TR/xhtml-modularization/abstract_modules.html#s_commonatts"/>
@@ -36,6 +36,7 @@
<xs:attribute name="title" type="xs:string"/>
</xs:attributeGroup>
<xs:attributeGroup name="xhtml.Core.attrib">
+ <xs:attribute ref="xml:space"/>
<xs:attributeGroup ref="xhtml.id"/>
<xs:attributeGroup ref="xhtml.class"/>
<xs:attributeGroup ref="xhtml.title"/>
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 da15e4c1..89938b4c 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
@@ -11,7 +11,7 @@
<xs:annotation>
<xs:documentation>
This is the XML Schema Block Phrasal support module for XHTML
- $Id: xhtml-blkphras-1.xsd,v 1.6 2006/09/11 10:27:50 ahby Exp $
+ $Id: xhtml-blkphras-1.xsd,v 1.7 2008/07/05 04:11:00 ahby Exp $
</xs:documentation>
<xs:documentation source="xhtml-copyright-1.xsd"/>
</xs:annotation>
@@ -66,7 +66,6 @@
</xs:complexType>
<!-- pre -->
<xs:attributeGroup name="xhtml.pre.attlist">
- <xs:attribute ref="xml:space"/>
<xs:attributeGroup ref="xhtml.Common.attrib"/>
</xs:attributeGroup>
<xs:group name="xhtml.pre.content">
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-datatypes-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-datatypes-1.xsd
index 5943cf35..860b1d6e 100644
--- a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-datatypes-1.xsd
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-datatypes-1.xsd
@@ -14,7 +14,7 @@
Defines containers for the XHTML datatypes, many of
these imported from other specifications and standards.
- $Id: xhtml-datatypes-1.xsd,v 1.9 2008/06/04 20:58:09 ahby Exp $
+ $Id: xhtml-datatypes-1.xsd,v 1.11 2008/10/07 16:57:03 ahby Exp $
</xs:documentation>
<xs:documentation source="xhtml-copyright-1.xsd"/>
<xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstraction.html#s_common_attrtypes"/>
@@ -151,23 +151,25 @@
</xs:simpleType>
<!-- CURIE placeholder datatypes -->
<xs:simpleType name="CURIE">
- <xs:restriction base="xs:string">
- <xs:pattern value="[\i-[:]][\c-[:]]*:.+" />
- </xs:restriction>
- </xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="(([\i-[:]][\c-[:]]*)?:)?.+" />
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="CURIEs">
<xs:list itemType="xh11d:CURIE"/>
</xs:simpleType>
<xs:simpleType name="SafeCURIE">
- <xs:restriction base="xs:string">
- <xs:pattern value="\[[\i-[:]][\c-[:]]*:.+\]" />
- </xs:restriction>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="\[(([\i-[:]][\c-[:]]*)?:)?.+\]" />
+ <xs:minLength value="3"/>
+ </xs:restriction>
</xs:simpleType>
<xs:simpleType name="SafeCURIEs">
<xs:list itemType="xh11d:SafeCURIE"/>
</xs:simpleType>
<xs:simpleType name="URIorSafeCURIE">
- <xs:union memberTypes="xs:anyURI xh11d:SafeCURIE" />
+ <xs:union memberTypes="xs:anyURI xh11d:SafeCURIE" />
</xs:simpleType>
<xs:simpleType name="URIorSafeCURIEs">
<xs:list itemType="xh11d:URIorSafeCURIE"/>
diff --git a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-struct-1.xsd b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-struct-1.xsd
index 60cbcbf5..39c8055d 100644
--- a/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-struct-1.xsd
+++ b/BKUViewer/src/main/resources/at/gv/egiz/bku/slxhtml/xhtml-struct-1.xsd
@@ -16,16 +16,28 @@
The Structure Module defines the major structural elements and
their attributes.
- $Id: xhtml-struct-1.xsd,v 1.8 2006/09/11 10:27:50 ahby Exp $
+ $Id: xhtml-struct-1.xsd,v 1.10 2008/07/05 04:11:00 ahby Exp $
</xs:documentation>
<xs:documentation source="xhtml-copyright-1.xsd"/>
<xs:documentation source="http://www.w3.org/TR/2001/REC-xhtml-modularization-20010410/abstract_modules.html#s_structuremodule"/>
</xs:annotation>
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+ schemaLocation="xml.xsd">
+ <xs:annotation>
+ <xs:documentation>
+ This import brings in the XML namespace attributes
+ The module itself does not provide the schemaLocation
+ and expects the driver schema to provide the
+ actual SchemaLocation.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:import>
<xs:attributeGroup
name="xhtml.title.attlist">
<xs:attributeGroup
ref="xhtml.I18n.attrib"/>
<xs:attributeGroup ref="xhtml.id"/>
+ <xs:attribute ref="xml:space"/>
</xs:attributeGroup>
<xs:group
name="xhtml.title.content">
@@ -52,6 +64,7 @@
<xs:attributeGroup
ref="xhtml.I18n.attrib"/>
<xs:attributeGroup ref="xhtml.id"/>
+ <xs:attribute ref="xml:space"/>
</xs:attributeGroup>
<xs:complexType
name="xhtml.head.type">
@@ -85,7 +98,7 @@
name="xhtml.version.attrib">
<xs:attribute
name="version"
- type="xh11d:FPI"/>
+ type="xh11d:CDATA"/>
</xs:attributeGroup>
<xs:attributeGroup
name="xhtml.html.attlist">
@@ -94,6 +107,7 @@
<xs:attributeGroup
ref="xhtml.I18n.attrib"/>
<xs:attributeGroup ref="xhtml.id"/>
+ <xs:attribute ref="xml:space"/>
</xs:attributeGroup>
<xs:group
name="xhtml.html.content">