From owner-svn-doc-projects@FreeBSD.ORG  Wed Jan 23 13:13:18 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2F34A113;
 Wed, 23 Jan 2013 13:13:18 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 216779E;
 Wed, 23 Jan 2013 13:13:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0NDDIho005657;
 Wed, 23 Jan 2013 13:13:18 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0NDDHtr005651;
 Wed, 23 Jan 2013 13:13:17 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201301231313.r0NDDHtr005651@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 23 Jan 2013 13:13:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r40730 - projects/xml-tools/share/xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Jan 2013 13:13:18 -0000

Author: gabor
Date: Wed Jan 23 13:13:16 2013
New Revision: 40730
URL: http://svnweb.freebsd.org/changeset/doc/40730

Log:
  - Reorganize stylesheets for easier customization

Added:
  projects/xml-tools/share/xsl/freebsd-xhtml-chunk.xsl
     - copied, changed from r39637, projects/xml-tools/share/xsl/freebsd-html-chunk.xsl
  projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl
     - copied, changed from r39637, projects/xml-tools/share/xsl/freebsd.xsl
  projects/xml-tools/share/xsl/freebsd-xhtml.xsl
     - copied, changed from r39637, projects/xml-tools/share/xsl/freebsd-html.xsl
Deleted:
  projects/xml-tools/share/xsl/default.xsl
  projects/xml-tools/share/xsl/freebsd-html-chunk.xsl
  projects/xml-tools/share/xsl/freebsd-html.xsl
  projects/xml-tools/share/xsl/freebsd.xsl
Modified:
  projects/xml-tools/share/xsl/freebsd-fo.xsl

Modified: projects/xml-tools/share/xsl/freebsd-fo.xsl
==============================================================================
--- projects/xml-tools/share/xsl/freebsd-fo.xsl	Wed Jan 23 13:05:57 2013	(r40729)
+++ projects/xml-tools/share/xsl/freebsd-fo.xsl	Wed Jan 23 13:13:16 2013	(r40730)
@@ -11,6 +11,9 @@
   <!-- Pull in the base stylesheets -->
   <xsl:import href="/usr/local/share/xsl/docbook/fo/docbook.xsl"/>
 
+  <!-- Include the common customizations -->
+  <xsl:include href="freebsd-common.xsl"/>
+
   <!-- Redefine variables, and replace templates as necessary here -->
 
   <xsl:param name="freebsd.output.print"
@@ -22,10 +25,6 @@
   <xsl:param name="freebsd.output.print.twoside"
              select="'0'"/>
 
-  <!-- Include the common stylesheets -->
-
-  <xsl:include href="freebsd-common.xsl"/>
-
   <!-- FO specific customisation goes here -->
 
   <xsl:param name="use.extensions" select="1"/>

Copied and modified: projects/xml-tools/share/xsl/freebsd-xhtml-chunk.xsl (from r39637, projects/xml-tools/share/xsl/freebsd-html-chunk.xsl)
==============================================================================
--- projects/xml-tools/share/xsl/freebsd-html-chunk.xsl	Tue Oct  2 12:54:21 2012	(r39637, copy source)
+++ projects/xml-tools/share/xsl/freebsd-xhtml-chunk.xsl	Wed Jan 23 13:13:16 2013	(r40730)
@@ -8,10 +8,9 @@
                 exclude-result-prefixes="#default">
 
   <!-- Pull in the base stylesheets -->
-  <xsl:import href="/usr/local/share/xsl/docbook/html/chunk.xsl"/>
+  <xsl:import href="/usr/local/share/xsl/docbook/xhtml/chunk.xsl"/>
 
-  <!-- Redefine variables, and replace templates as necessary here -->
-
-  <xsl:include href="freebsd-common.xsl"/>
+  <!-- Pull in common XHTML customizations -->
+  <xsl:include href="freebsd-xhtml-common.xsl"/>
 </xsl:stylesheet>
 

Copied and modified: projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl (from r39637, projects/xml-tools/share/xsl/freebsd.xsl)
==============================================================================
--- projects/xml-tools/share/xsl/freebsd.xsl	Tue Oct  2 12:54:21 2012	(r39637, copy source)
+++ projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl	Wed Jan 23 13:13:16 2013	(r40730)
@@ -11,9 +11,32 @@
   <!-- XXX hardcoded path.  Very bad.  Should be turned in to a paramater -->
   <xsl:import href="/usr/local/share/xml/docbook/xsl/modular/html/docbook.xsl"/>
 
+  <!-- Include the common customizations -->
+  <xsl:include href="freebsd-common.xsl"/>
+
   <!-- Redefine variables, and replace templates as necessary here -->
+  <xsl:param name="freebsd.output.html" select="'0'"/>
+  <xsl:param name="freebsd.output.html.images" select="'0'"/>
+
+  <!-- HTML specific customisation goes here -->
+
+  <xsl:param name="html.stylesheet" select="'docbook.css'"/>
+  <xsl:param name="user.id.as.filename" select="'1'"/>
+  <xsl:param name="generate.legalnotice.link" select="'1'"/>
+  <xsl:param name="link.mailto.url" select="'doc@FreeBSD.org'"/>
+  <xsl:param name="callout.graphics.path" select="'./imagelib/callouts/'"/>
+
+  <xsl:template name="user.footer.content">
+    <p align="center"><small>This, and other documents, can be downloaded
+    from <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
+
+    <p align="center"><small>For questions about FreeBSD, read the
+    <a href="http://www.FreeBSD.org/docs.html">documentation</a> before
+    contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
+    For questions about this documentation, e-mail &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
+  </xsl:template>
+
   <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
     <xsl:call-template name="inline.monoseq"/>
   </xsl:template>
-
 </xsl:stylesheet>

Copied and modified: projects/xml-tools/share/xsl/freebsd-xhtml.xsl (from r39637, projects/xml-tools/share/xsl/freebsd-html.xsl)
==============================================================================
--- projects/xml-tools/share/xsl/freebsd-html.xsl	Tue Oct  2 12:54:21 2012	(r39637, copy source)
+++ projects/xml-tools/share/xsl/freebsd-xhtml.xsl	Wed Jan 23 13:13:16 2013	(r40730)
@@ -8,28 +8,9 @@
                 exclude-result-prefixes="#default">
 
   <!-- Pull in the base stylesheets -->
-  <xsl:import href="/usr/local/share/xsl/docbook/html/docbook.xsl"/>
+  <xsl:import href="/usr/local/share/xsl/docbook/xhtml/docbook.xsl"/>
 
-  <!-- Redefine variables, and replace templates as necessary here -->
-  <xsl:param name="freebsd.output.html" select="'0'"/>
-  <xsl:param name="freebsd.output.html.images" select="'0'"/>
-
-  <!-- HTML specific customisation goes here -->
-
-  <xsl:param name="html.stylesheet" select="'docbook.css'"/>
-  <xsl:param name="user.id.as.filename" select="'1'"/>
-  <xsl:param name="generate.legalnotice.link" select="'1'"/>
-  <xsl:param name="link.mailto.url" select="'doc@FreeBSD.org'"/>
-  <xsl:param name="callout.graphics.path" select="'./imagelib/callouts/'"/>
-
-  <xsl:template name="user.footer.content">
-    <p align="center"><small>This, and other documents, can be downloaded
-    from <a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/</a></small></p>
-
-    <p align="center"><small>For questions about FreeBSD, read the
-    <a href="http://www.FreeBSD.org/docs.html">documentation</a> before
-    contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.<br/>
-    For questions about this documentation, e-mail &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
-  </xsl:template>
+  <!-- Pull in common XHTML customizations -->
+  <xsl:include href="freebsd-xhtml-common.xsl"/>
 </xsl:stylesheet>