Schemarestriktionen erleichtert:tags/Build.002-svn

- table/@width erlaubt
- @valign, @halign in allen Tabellenelementen erlabut (table, tr, th, td, col, colgroup)
- @style in allen Elementen erlaubt


git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@86 d688527b-c9ab-4aba-bd8d-4036d912da1d

4 files changed, 68 insertions, 0 deletions

diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-model-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-model-1.xsd
index 140b35e84..8e91a8d06 100644
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-model-1.xsd
+++ b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-model-1.xsd
@@ -58,6 +58,9 @@
         SLXHTML: attributeGroup "style.attrib" removed.

        </xs:documentation>

     </xs:annotation>      

+    <!-- Beginn: Workaround E-Recht 20031218 -->

+    <xs:attributeGroup ref="style.attrib"/>
+    <!-- Ende: Workaround E-Recht 20031218 -->

   </xs:attributeGroup>

 

   <xs:attributeGroup name="Core.extra.attrib">

diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-module-redefines-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-module-redefines-1.xsd
index d58fe93f0..d18640e7f 100644
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-module-redefines-1.xsd
+++ b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-module-redefines-1.xsd
@@ -161,6 +161,10 @@
       <xs:attributeGroup ref="Common.attrib"/>

       <xs:attribute name="rowspan" type="Number" default="1"/>

       <xs:attribute name="colspan" type="Number" default="1"/>

+      <!-- Beginn: Workaround E-Recht 20031218 -->

+      <xs:attributeGroup ref="CellHAlign.attrib"/>

+      <xs:attributeGroup ref="CellVAlign.attrib"/>

+      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="th.attlist">

@@ -174,6 +178,10 @@
       <xs:attributeGroup ref="Common.attrib"/>

       <xs:attribute name="rowspan" type="Number" default="1"/>

       <xs:attribute name="colspan" type="Number" default="1"/>

+      <!-- Beginn: Workaround E-Recht 20031218 -->

+      <xs:attributeGroup ref="CellHAlign.attrib"/>

+      <xs:attributeGroup ref="CellVAlign.attrib"/>

+      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="tr.attlist">

@@ -184,6 +192,10 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

+      <!-- Beginn: Workaround E-Recht 20031218 -->

+      <xs:attributeGroup ref="CellHAlign.attrib"/>

+      <xs:attributeGroup ref="CellVAlign.attrib"/>

+      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="col.attlist">

@@ -195,6 +207,10 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

+      <!-- Beginn: Workaround E-Recht 20031218 -->

+      <xs:attributeGroup ref="CellHAlign.attrib"/>

+      <xs:attributeGroup ref="CellVAlign.attrib"/>

+      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="colgroup.attlist">

@@ -206,6 +222,10 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

+      <!-- Beginn: Workaround E-Recht 20031218 -->

+      <xs:attributeGroup ref="CellHAlign.attrib"/>

+      <xs:attributeGroup ref="CellVAlign.attrib"/>

+      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="tbody.attlist">

@@ -216,6 +236,10 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

+      <!-- Beginn: Workaround E-Recht 20031218 -->

+      <xs:attributeGroup ref="CellHAlign.attrib"/>

+      <xs:attributeGroup ref="CellVAlign.attrib"/>

+      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="tfoot.attlist">

@@ -226,6 +250,10 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

+      <!-- Beginn: Workaround E-Recht 20031218 -->

+      <xs:attributeGroup ref="CellHAlign.attrib"/>

+      <xs:attributeGroup ref="CellVAlign.attrib"/>

+      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="thead.attlist">

@@ -236,6 +264,10 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

+      <!-- Beginn: Workaround E-Recht 20031218 -->

+      <xs:attributeGroup ref="CellHAlign.attrib"/>

+      <xs:attributeGroup ref="CellVAlign.attrib"/>

+      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="table.attlist">

@@ -247,6 +279,9 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

+      <!-- Beginn: Workaround E-Recht 20031218 -->

+      <xs:attribute name="width" type="Length"/>

+      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

   </xs:redefine>

 

diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml.xsd
index 05087803f..6f85b1fad 100644
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml.xsd
+++ b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml.xsd
@@ -170,4 +170,7 @@
       </xs:documentation>

     </xs:annotation>

   </xs:include>-->

+  <!-- Beginn: Workaround E-Recht 20031218 -->

+  <xs:include schemaLocation="xhtml-inlstyle-1.xsd"/>
+  <!-- Beginn: Workaround E-Recht 20031218 -->

 </xs:schema>

diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlstyle-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlstyle-1.xsd
new file mode 100644
index 000000000..d9f60ad12
--- /dev/null
+++ b/spss.slinterface/res/resources/schemas/slxhtml-1.0/xhtml-inlstyle-1.xsd
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.w3.org/1999/xhtml"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns="http://www.w3.org/1999/xhtml">
+
+  <xs:annotation>
+    <xs:documentation>
+      Inline Style module    
+      This is the XML Schema Inline Style module for XHTML
+      
+         * styloe attribute
+
+      This module declares the 'style' attribute, used to support inline 
+      style markup. 
+
+      $Id: xhtml-inlstyle-1.xsd,v 1.2 2003/09/20 01:41:37 speruvem 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_styleattributemodule"/>    
+  </xs:annotation>
+
+  <xs:attributeGroup name="style.attrib">
+    <xs:attribute name="style" type="CDATA"/>
+  </xs:attributeGroup>
+
+</xs:schema>