From: Rocco Rutte <pdmef@gmx.net>
Date: Wed, 10 Dec 2008 14:36:29 +0000 (+0100)
Subject: Move common XSLT params to mutt.xsl imported into (chunk|html).xsl
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b03f07cc0325f9a50aaf5589c5c73ed08cfbdd11;p=neomutt

Move common XSLT params to mutt.xsl imported into (chunk|html).xsl
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 66334ac7a..e3b049357 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -27,7 +27,7 @@ EXTRA_DIST = dotlock.man		\
 	smime-notes.txt			\
 	Muttrc Muttrc.head stamp-doc-rc \
 	makedoc.c makedoc-defs.h 	\
-	mutt.css html.xsl chunk.xsl $(BUILT_DISTFILES)
+	mutt.css mutt.xsl html.xsl chunk.xsl $(BUILT_DISTFILES)
 
 HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \
 	configuration.html mimesupport.html advancedusage.html \
@@ -112,10 +112,10 @@ stamp-doc-rc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head
 	  $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -c >> Muttrc
 	touch stamp-doc-rc
 
-manual.html: $(srcdir)/html.xsl stamp-doc-xml $(srcdir)/mutt.css
+manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
 	-xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
 
-stamp-doc-chunked: $(srcdir)/chunk.xsl stamp-doc-xml $(srcdir)/mutt.css
+stamp-doc-chunked: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
 	-xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
 	touch stamp-doc-chunked
 
diff --git a/doc/chunk.xsl b/doc/chunk.xsl
index b75707036..2734de560 100644
--- a/doc/chunk.xsl
+++ b/doc/chunk.xsl
@@ -1,17 +1,7 @@
 <?xml version="1.0"?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY css SYSTEM "mutt.css">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
-  <xsl:param name="section.autolabel" select="1"/>
+  <xsl:import href="mutt.xsl"/>
   <xsl:param name="use.id.as.filename" select="1"/>
   <xsl:param name="chunk.section.depth" select="0"/>
-  <xsl:template name="user.head.content">
-    <xsl:element name="style">
-      <xsl:attribute name="type">text/css</xsl:attribute>
-      &css;
-    </xsl:element>
-  </xsl:template>
 </xsl:stylesheet>
diff --git a/doc/html.xsl b/doc/html.xsl
index 1dbdb5589..e6912ef89 100644
--- a/doc/html.xsl
+++ b/doc/html.xsl
@@ -1,15 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY css SYSTEM "mutt.css">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
-  <xsl:param name="section.autolabel" select="1"></xsl:param>
-  <xsl:template name="user.head.content">
-    <xsl:element name="style">
-      <xsl:attribute name="type">text/css</xsl:attribute>
-      &css;
-    </xsl:element>
-  </xsl:template>
+  <xsl:import href="mutt.xsl"/>
 </xsl:stylesheet>
diff --git a/doc/mutt.xsl b/doc/mutt.xsl
new file mode 100644
index 000000000..a075a5b3d
--- /dev/null
+++ b/doc/mutt.xsl
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE xsl:stylesheet [
+<!ENTITY css SYSTEM "mutt.css">
+]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:param name="section.autolabel" select="1"></xsl:param>
+  <xsl:template name="user.head.content">
+    <xsl:element name="style">
+      <xsl:attribute name="type">text/css</xsl:attribute>
+      &css;
+    </xsl:element>
+  </xsl:template>
+  <xsl:param name="admon.style"/>
+</xsl:stylesheet>