Don't output xmlns attributes except on root element

15 years ago · 94051e3c05
parent 94d27cb2bf
commit 94051e3c05
11 changed files with 49 additions and 27 deletions
--- a/xsl/atom.xsl
+++ b/xsl/atom.xsl
@ -1,9 +1,12 @@
 <?xml version='1.0'?>

 <xsl:stylesheet version="1.1"
-    xmlns="http://www.w3.org/1999/xhtml"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc">
+    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc"
+    xmlns="http://www.w3.org/2005/Atom"
+    exclude-result-prefixes="csc">
+
+<xsl:output method="xml" encoding="ISO-8859-1" />

 <xsl:param name="g_datetime" required="yes" />

@ -27,7 +30,7 @@
    <xsl:param name="title"/>
    <xsl:param name="feedfile"/>
    <xsl:param name="uuid"/>
-    <feed xmlns="http://www.w3.org/2005/Atom">
+    <feed>
        <title>UW Computer Science Club <xsl:value-of select="$title"/></title>
        <link href="http://csclub.uwaterloo.ca/{$feedfile}" rel="self"/>
        <link href="http://csclub.uwaterloo.ca/"/>
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@ -1,9 +1,11 @@
 <?xml version='1.0'?>

 <xsl:stylesheet version="1.1"
-    xmlns="http://www.w3.org/1999/xhtml"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc">
+    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc"
+    xmlns="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="csc">
+<xsl:output method="xml" />

 <xsl:template match="cscpage">
  <html>
--- a/xsl/directory.xsl
+++ b/xsl/directory.xsl
@ -1,9 +1,11 @@
 <?xml version='1.0'?>

 <xsl:stylesheet version="1.1"
-    xmlns="http://www.w3.org/1999/xhtml"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc">
+    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc"
+    xmlns="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="csc">
+<xsl:output method="xml" />

 <xsl:template match="directory">
  <xsl:variable name="href">
--- a/xsl/events.xsl
+++ b/xsl/events.xsl
@ -1,9 +1,11 @@
 <?xml version='1.0'?>

 <xsl:stylesheet version="1.1"
-    xmlns="http://www.w3.org/1999/xhtml"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc">
+    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc"
+    xmlns="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="csc">
+<xsl:output method="xml" />

 <xsl:template name="events">
  <tr>
--- a/xsl/functions.xsl
+++ b/xsl/functions.xsl
@ -1,9 +1,11 @@
 <?xml version='1.0'?>

 <xsl:stylesheet version="1.1"
-    xmlns="http://www.w3.org/1999/xhtml"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc">
+    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc"
+    xmlns="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="csc">
+<xsl:output method="xml" />

 <xsl:template name="donate-now">
 <p>Please consider <a href="{$g_pre}about/donations.html">donating to the
--- a/xsl/html.xsl
+++ b/xsl/html.xsl
@ -1,9 +1,14 @@
 <?xml version='1.0'?>

 <xsl:stylesheet version="1.1"
-    xmlns="http://www.w3.org/1999/xhtml"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc">
+    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc"
+    xmlns="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="csc">
+
+<xsl:output method="xml" encoding="ISO-8859-1"
+    doctype-public="-//W3C//DTD XHTML 1.1//EN"
+    doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" />

 <xsl:param name="g_date" required="yes" />
 <xsl:param name="g_time" required="yes" />
@ -29,10 +34,6 @@
 <xsl:variable name="g_mirror_csc">http://csclub.uwaterloo.ca/files/</xsl:variable>
 <xsl:variable name="g_mirror_cs">http://mirror.cs.uwaterloo.ca/csclub/</xsl:variable>

-<xsl:output method="xml" encoding="ISO-8859-1"
-    doctype-public="-//W3C//DTD XHTML 1.1//EN"
-    doctype-system="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" />
-
 <!-- include additional style sheets -->
 <xsl:include href="functions.xsl" />
 <xsl:include href="common.xsl" />
--- a/xsl/media.xsl
+++ b/xsl/media.xsl
@ -1,9 +1,11 @@
 <?xml version='1.0'?>

 <xsl:stylesheet version="1.1"
-    xmlns="http://www.w3.org/1999/xhtml"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc">
+    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc"
+    xmlns="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="csc">
+<xsl:output method="xml" />

 <xsl:template match="mediafile">
  <xsl:param name="ext" />
--- a/xsl/members.xsl
+++ b/xsl/members.xsl
@ -1,9 +1,11 @@
 <?xml version='1.0'?>

 <xsl:stylesheet version="1.1"
-    xmlns="http://www.w3.org/1999/xhtml"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc">
+    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc"
+    xmlns="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="csc">
+<xsl:output method="xml" />

 <xsl:template match="members-this-term">
  <p>The members for <xsl:value-of select="csc:term($g_date)" /> are
--- a/xsl/menu.xsl
+++ b/xsl/menu.xsl
@ -1,9 +1,11 @@
 <?xml version='1.0'?>

 <xsl:stylesheet version="1.1"
-    xmlns="http://www.w3.org/1999/xhtml"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc">
+    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc"
+    xmlns="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="csc">
+<xsl:output method="xml" />

 <xsl:template match="menuitem">
  <xsl:variable name="preabs">
--- a/xsl/news.xsl
+++ b/xsl/news.xsl
@ -1,9 +1,11 @@
 <?xml version='1.0'?>

 <xsl:stylesheet version="1.1"
-    xmlns="http://www.w3.org/1999/xhtml"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc">
+    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc"
+    xmlns="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="csc">
+<xsl:output method="xml" />

 <xsl:template match="newsdefs">
  <xsl:apply-templates select="newsitem[csc:term(@date) = csc:term($g_date)]">
--- a/xsl/positions.xsl
+++ b/xsl/positions.xsl
@ -1,9 +1,11 @@
 <?xml version='1.0'?>

 <xsl:stylesheet version="1.1"
-    xmlns="http://www.w3.org/1999/xhtml"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc">
+    xmlns:csc="http://csclub.uwaterloo.ca/xsltproc"
+    xmlns="http://www.w3.org/1999/xhtml"
+    exclude-result-prefixes="csc">
+<xsl:output method="xml" />

 <xsl:template match="positions">
  <xsl:variable name="exec" select="@exec" />