1.1 --- a/examples/Common/PEP241/Resources/pep241_categories.xsl Thu Dec 23 15:07:37 2004 +0000
1.2 +++ b/examples/Common/PEP241/Resources/pep241_categories.xsl Thu Dec 23 15:07:53 2004 +0000
1.3 @@ -5,11 +5,19 @@
1.4
1.5 <xsl:param name="categories"/>
1.6
1.7 - <xsl:template match="discriminator">
1.8 + <xsl:template match="categories">
1.9 <xsl:copy>
1.10 <xsl:element name="category">
1.11 - <xsl:attribute name="value"><xsl:value-of select="@category"/></xsl:attribute>
1.12 - <xsl:copy-of select="$categories/category/category-enum"/>
1.13 + <xsl:variable name="category-elements" select="category"/>
1.14 + <xsl:for-each select="$categories/category/category-enum">
1.15 + <xsl:variable name="category-enum" select="."/>
1.16 + <xsl:copy>
1.17 + <xsl:apply-templates select="@*"/>
1.18 + <xsl:if test="$category-elements[@value = $category-enum/@value]">
1.19 + <xsl:attribute name="value-is-set">true</xsl:attribute>
1.20 + </xsl:if>
1.21 + </xsl:copy>
1.22 + </xsl:for-each>
1.23 </xsl:element>
1.24 </xsl:copy>
1.25 </xsl:template>
2.1 --- a/examples/Common/PEP241/Resources/pep241_error.xml Thu Dec 23 15:07:37 2004 +0000
2.2 +++ b/examples/Common/PEP241/Resources/pep241_error.xml Thu Dec 23 15:07:53 2004 +0000
2.3 @@ -17,34 +17,19 @@
2.4 <dependencies>
2.5 <dependency name="PyXML" version="0.7.1"/>
2.6 </dependencies>
2.7 - <discriminators>
2.8 - <discriminator>
2.9 - <category value="Programming Language :: Python">
2.10 - <category-enum value="Development Status :: 1 - Planning"/>
2.11 - <category-enum value="Development Status :: 2 - Pre-Alpha"/>
2.12 - <category-enum value="Development Status :: 3 - Alpha"/>
2.13 - <category-enum value="Development Status :: 4 - Beta"/>
2.14 - <category-enum value="Development Status :: 5 - Production/Stable"/>
2.15 - <category-enum value="Development Status :: 6 - Mature"/>
2.16 - <category-enum value="Development Status :: 7 - Inactive"/>
2.17 - <category-enum value="Programming Language :: Python"/>
2.18 - <category-enum value="Topic :: Text Processing :: Markup :: XML"/>
2.19 - </category>
2.20 - </discriminator>
2.21 - <discriminator>
2.22 - <category value="Topic :: Text Processing :: Markup :: XML">
2.23 - <category-enum value="Development Status :: 1 - Planning"/>
2.24 - <category-enum value="Development Status :: 2 - Pre-Alpha"/>
2.25 - <category-enum value="Development Status :: 3 - Alpha"/>
2.26 - <category-enum value="Development Status :: 4 - Beta"/>
2.27 - <category-enum value="Development Status :: 5 - Production/Stable"/>
2.28 - <category-enum value="Development Status :: 6 - Mature"/>
2.29 - <category-enum value="Development Status :: 7 - Inactive"/>
2.30 - <category-enum value="Programming Language :: Python"/>
2.31 - <category-enum value="Topic :: Text Processing :: Markup :: XML"/>
2.32 - </category>
2.33 - </discriminator>
2.34 - </discriminators>
2.35 + <categories>
2.36 + <category>
2.37 + <category-enum value="Development Status :: 1 - Planning"/>
2.38 + <category-enum value="Development Status :: 2 - Pre-Alpha"/>
2.39 + <category-enum value="Development Status :: 3 - Alpha"/>
2.40 + <category-enum value="Development Status :: 4 - Beta"/>
2.41 + <category-enum value="Development Status :: 5 - Production/Stable"/>
2.42 + <category-enum value="Development Status :: 6 - Mature"/>
2.43 + <category-enum value="Development Status :: 7 - Inactive"/>
2.44 + <category-enum value="Programming Language :: Python" value-is-set="true"/>
2.45 + <category-enum value="Topic :: Text Processing :: Markup :: XML" value-is-set="true"/>
2.46 + </category>
2.47 + </categories>
2.48 <!-- Errors must appear last in an element to avoid positioning issues. -->
2.49 <error description-size="1000"/>
2.50 </package>
3.1 --- a/examples/Common/PEP241/Resources/pep241_input.xml Thu Dec 23 15:07:37 2004 +0000
3.2 +++ b/examples/Common/PEP241/Resources/pep241_input.xml Thu Dec 23 15:07:53 2004 +0000
3.3 @@ -15,8 +15,8 @@
3.4 <dependencies>
3.5 <dependency name="PyXML" version="0.7.1"/>
3.6 </dependencies>
3.7 - <discriminators>
3.8 - <discriminator category="Programming Language :: Python"/>
3.9 - <discriminator category="Topic :: Text Processing :: Markup :: XML"/>
3.10 - </discriminators>
3.11 + <categories>
3.12 + <category value="Programming Language :: Python"/>
3.13 + <category value="Topic :: Text Processing :: Markup :: XML"/>
3.14 + </categories>
3.15 </package>
4.1 --- a/examples/Common/PEP241/Resources/pep241_template.xhtml Thu Dec 23 15:07:37 2004 +0000
4.2 +++ b/examples/Common/PEP241/Resources/pep241_template.xhtml Thu Dec 23 15:07:53 2004 +0000
4.3 @@ -56,23 +56,14 @@
4.4 <tr>
4.5 <th colspan="2" class="heading">Discriminators</th>
4.6 </tr>
4.7 - <tr template:element="discriminators,discriminator">
4.8 - <th>Discriminator</th>
4.9 + <tr template:element="categories">
4.10 + <th>Categories</th>
4.11 <td>
4.12 - <select template:element="category" name="{template:field-name()}">
4.13 - <option template:element="category-enum" template:expr-attr="selected" template:expr="@value = ../@value" template:value="@value"
4.14 + <select template:element="category" name="{template:field-name()}" multiple="multiple">
4.15 + <option template:element="category-enum" template:expr-attr="selected" template:expr="@value-is-set" template:value="@value"
4.16 value="{@value}"></option>
4.17 </select>
4.18 -
4.19 - <input type="submit" value="Remove!"
4.20 - name="remove_discriminator={template:this-position()}"
4.21 - /></td>
4.22 - </tr>
4.23 - <tr>
4.24 - <th></th>
4.25 - <td>
4.26 - <input type="submit" value="Add discriminator!"
4.27 - name="add_discriminator={template:this-position()}" /></td>
4.28 + </td>
4.29 </tr>
4.30 <tr>
4.31 <th colspan="2" class="heading">Platforms</th>