Remove sed xmlns hack

15 years ago · 8ae2160f7a
parent c7fe29e320
commit 8ae2160f7a
5 changed files with 2 additions and 13 deletions
--- a/common.mk.in
+++ b/common.mk.in
@ -29,11 +29,9 @@ CLASSPATH = /users/www/saxon8/saxon8.jar

 $(OUTDIR)%.html: %.xml $(ROOT)/csc.dtd $(ROOT)/xsl/*.xsl directory.xml
 	java -classpath $(CLASSPATH) net.sf.saxon.Transform -o $@ $< $(ROOT)/xsl/html.xsl $(XSLTARGS)
-	sed -i 's| xmlns=""||' $@

 $(OUTDIR)%.atom: %.xml xsl/atom.xsl
 	java -classpath $(CLASSPATH) net.sf.saxon.Transform -o $@  $< $(ROOT)/xsl/atom.xsl $(XSLTARGS)
-	sed -i 's| xmlns=""||' $@

 $(OUTDIR)%.ics: %.xml
 	perl scripts/xml2ics.pl $< > $@
--- a/events/Makefile
+++ b/events/Makefile
@ -2,7 +2,4 @@ FILES = index.html old.html
 RELDIR = events/
 include ../common.mk

-build:
-	sed -i 's| xmlns=""||' $(OUTDIR)*.html
-
 $(OUTDIR)index.html: ../events.xml
--- a/media/Makefile
+++ b/media/Makefile
@ -4,6 +4,3 @@ include ../common.mk

 $(OUTDIR)flash:
 	ln -s ../flash $(OUTDIR)flash
-
-build:
-	sed -i 's| xmlns=""||' $(OUTDIR)*.html
--- a/news/Makefile
+++ b/news/Makefile
@ -2,7 +2,4 @@ FILES = index.html
 RELDIR = news/
 include ../common.mk

-build:
-	sed -i 's| xmlns=""||' $(OUTDIR)*.html
-
 $(OUTDIR)index.html: ../news.xml
--- a/xsl/html.xsl
+++ b/xsl/html.xsl
@ -45,10 +45,10 @@
 <xsl:include href="media.xsl" />

 <xsl:template match="*">
-  <xsl:copy>
+  <xsl:element name="{name()}">
    <xsl:copy-of select="@*" />
    <xsl:apply-templates />
-  </xsl:copy>
+  </xsl:element>
 </xsl:template>

 </xsl:stylesheet>