From 3798e8c5c0544ce62ab2c8751ddb21bbd4726d1c Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Fri, 8 Apr 2011 13:29:12 -0400
Subject: A number of schema changes/fixes/updates:

* altsrc attr is not allowed on Service and Action tags
* Removed duplicate definition of PackageType, fixed required attrs
* Removed deprecated <Ignore> tags in BoundPackage Instances
* Added Genshi schema, made Genshi bundles validate
* Use builtin xs:boolean type where possible
---
 schemas/genshi.xsd | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 schemas/genshi.xsd

(limited to 'schemas/genshi.xsd')

diff --git a/schemas/genshi.xsd b/schemas/genshi.xsd
new file mode 100644
index 000000000..853b69c0d
--- /dev/null
+++ b/schemas/genshi.xsd
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:py="http://genshi.edgewall.org/"
+           xml:lang="en"
+           targetNamespace="http://genshi.edgewall.org/">
+  <xs:annotation>
+    <xs:documentation>
+      Genshi schema
+      Chris St. Pierre
+      $Id$
+    </xs:documentation>
+  </xs:annotation>
+
+  <!-- genshi tags -->
+  <xs:element name="for" type="py:forType"/>
+  <xs:complexType name="forType" mixed="true">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:any processContents="lax"/>
+    </xs:choice>
+    <xs:attribute name="each" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:element name="if" type="py:ifType"/>
+  <xs:complexType name="ifType" mixed="true">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:any processContents="lax"/>
+    </xs:choice>
+    <xs:attribute name="test" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:element name="match" type="py:matchType"/>
+  <xs:complexType name="matchType" mixed="true">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:any processContents="lax"/>
+    </xs:choice>
+    <xs:attribute name="path" type="xs:string" use="required"/>
+    <xs:attribute name="once" type="xs:boolean" default="false"/>
+    <xs:attribute name="buffer" type="xs:boolean" default="true"/>
+    <xs:attribute name="recursive" type="xs:boolean" default="true"/>
+  </xs:complexType>
+
+  <xs:element name="def" type="py:defType"/>
+  <xs:complexType name="defType" mixed="true">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:any processContents="lax"/>
+    </xs:choice>
+    <xs:attribute name="function" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:element name="with" type="py:withType"/>
+  <xs:complexType name="withType" mixed="true">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:any processContents="lax"/>
+    </xs:choice>
+    <xs:attribute name="vars" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:element name="replace" type="py:replaceType"/>
+  <xs:complexType name="replaceType" mixed="true">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:any processContents="lax"/>
+    </xs:choice>
+    <xs:attribute name="value" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:element name="choose" type="py:chooseType"/>
+  <xs:complexType name="chooseType" mixed="true">
+    <xs:sequence>
+      <xs:element name="when" type="py:ifType" maxOccurs="unbounded"/>
+      <xs:element name="otherwise" type="py:otherwiseType"
+                   minOccurs="0"/>
+    </xs:sequence>
+    <xs:attribute name="test" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="otherwiseType" mixed="true">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:any processContents="lax"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <!-- genshi attributes -->
+  <xs:attributeGroup name="genshiAttrs">
+    <xs:attribute name="ifAttr" type="xs:string"/>
+    <xs:attribute name="chooseAttr" type="xs:string"/>
+    <xs:attribute name="whenAttr" type="xs:string"/>
+    <xs:attribute name="otherwiseAttr" type="xs:string"/>
+    <xs:attribute name="forAttr" type="xs:string"/>
+    <xs:attribute name="defAttr" type="xs:string"/>
+    <xs:attribute name="matchAttr" type="xs:string"/>
+    <xs:attribute name="withAttr" type="xs:string"/>
+    <xs:attribute name="attrsAttr" type="xs:string"/>
+    <xs:attribute name="contentAttr" type="xs:string"/>
+    <xs:attribute name="replaceAttr" type="xs:string"/>
+    <xs:attribute name="stripAttr" type="xs:string"/>
+  </xs:attributeGroup>
+</xs:schema>
-- 
cgit v1.2.3-1-g7c22


From 701ff48cc9561ce88e80c1de5a19f8d6cda790bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Wei=C3=9F?= <holger@zedat.fu-berlin.de>
Date: Mon, 6 Jun 2011 00:54:55 +0200
Subject: All Genshi XML tags should be namespace-qualified

Our XML Schema for Genshi templates expected "choose" blocks to be
declared like this:

  <py:choose test="$foo">
    <when test="0"><!-- [...] --></when>
    <when test="1"><!-- [...] --></when>
    <otherwise><!-- [...] --></otherwise>
  </py:choose>

However, we prefer to namespace-qualify not only the "choose" element,
but also the "when" and "otherwise" tags (for clarity, and because
that's how it's done in the Genshi documentation):

  <py:choose test="$foo">
    <py:when test="0"><!-- [...] --></py:when>
    <py:when test="1"><!-- [...] --></py:when>
    <py:otherwise><!-- [...] --></py:otherwise>
  </py:choose>

This commit tells XML Schema validators to expect the latter style.
---
 schemas/genshi.xsd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'schemas/genshi.xsd')

diff --git a/schemas/genshi.xsd b/schemas/genshi.xsd
index 853b69c0d..d87c4a6e3 100644
--- a/schemas/genshi.xsd
+++ b/schemas/genshi.xsd
@@ -2,7 +2,8 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            xmlns:py="http://genshi.edgewall.org/"
            xml:lang="en"
-           targetNamespace="http://genshi.edgewall.org/">
+           targetNamespace="http://genshi.edgewall.org/"
+           elementFormDefault="qualified">
   <xs:annotation>
     <xs:documentation>
       Genshi schema
-- 
cgit v1.2.3-1-g7c22