Added support for embedded SVG via xs:import in htmlbook.xsd

Sanders Kleinfeld · Sanders Kleinfeld · commit 7a4421f64ae0 · 2013-03-29T13:53:03.000-04:00
diff --git a/htmlbook.xsd b/htmlbook.xsd
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" targetNamespace="http://www.w3.org/1999/xhtml" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:svg="http://www.w3.org/2000/svg" targetNamespace="http://www.w3.org/1999/xhtml" elementFormDefault="qualified" attributeFormDefault="unqualified">
 
 <xs:import namespace="http://www.w3.org/1998/Math/MathML" schemaLocation="mathml3/mathml3.xsd"/>
+<xs:import namespace="http://www.w3.org/2000/svg" schemaLocation="svg/SVG.xsd"/>
 
 <xs:element name="html">
   <xs:complexType>
@@ -1330,8 +1331,7 @@
     <xs:element ref="ol"/>
     <xs:element ref="p"/>
     <xs:element ref="pre"/>
-    <!-- ToDo: Add separate schema for SVG ref here? 
-    <xs:element ref="svg:svg"/> -->
+    <xs:element ref="svg:svg"/>
     <xs:element ref="table"/>
     <xs:element ref="ul"/>
     <xs:element ref="video"/>
diff --git a/samples/test_schema.html b/samples/test_schema.html
@@ -1,4 +1,3 @@
-<?xml-model href="../htmlbook.xsd" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
 <html xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://www.w3.org/1999/xhtml ../htmlbook.xsd"
  xmlns="http://www.w3.org/1999/xhtml">
@@ -97,8 +96,12 @@ <h5>Test</h5>
               <img src="image.png" id="an_image" lang="en"/>
             </figure>
             
+            <!-- Some embedded MML -->
             <math xmlns="http://www.w3.org/1998/Math/MathML"><mn>2</mn> <mo>+</mo> <mn>2</mn> <mo>=</mo> <mn>4</mn></math>
             
+            <!-- Some embedded SVG -->
+            <svg xmlns="http://www.w3.org/2000/svg" width="300" height="200"><desc>SVG content goes here...</desc></svg>
+            
             <!-- Oh boy, let's do a couple tables -->
             <!-- No <tbody> -->
             <table border="" id="skeleton_of_a_table" accesskey="A a d">
