svn commit - mysqldoc@docsrva: r4504 - in trunk: . make.d xsl.d

[paul]

Author: paul
Date: 2007-01-15 04:28:15 +0100 (Mon, 15 Jan 2007)
New Revision: 4504

Log:
 r14605@frost:  paul | 2007-01-14 21:12:24 -0600
 Update transform dependencies.


Modified:
   trunk/make.d/vars-docbook
   trunk/xsl.d/mysql-fo.xsl
   trunk/xsl.d/mysql-html-section.xsl
   trunk/xsl.d/mysql-html.xsl

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:18042
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14416
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13520
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:18042
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14605
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13520


Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook	2007-01-15 01:15:24 UTC (rev 4503)
+++ trunk/make.d/vars-docbook	2007-01-15 03:28:15 UTC (rev 4504)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 1; 1042 bytes

@@ -213,6 +213,7 @@
 
 MYSQL_HTML_XSL = $(XSL_DIR)/mysql-html.xsl
 MYSQL_HTML_XSL_DEPS = $(MYSQL_HTML_XSL) \
+	$(XSL_DIR)/mysql.formalpara.templates.html.xsl \
 	$(HTML_CSS_FILE)
 
 # Driver stylesheet for Docbook -> HTML, one file per chapter or section

@@ -220,6 +221,7 @@
 MYSQL_HTML_SECTION_XSL = $(XSL_DIR)/mysql-html-section.xsl
 MYSQL_HTML_SECTION_XSL_DEPS = $(MYSQL_HTML_SECTION_XSL) \
 	$(XSL_DIR)/mysql-disclaimer-html.xsl \
+	$(XSL_DIR)/mysql.formalpara.templates.html.xsl \
 	$(HTML_CSS_FILE)
 
 # Driver stylesheet for Docbook -> HTML Help, one file per chapter or section

@@ -282,7 +284,8 @@
 # to produce PDF
 
 MYSQL_FO_XSL = $(XSL_DIR)/mysql-fo.xsl
-MYSQL_FO_XSL_DEPS = $(MYSQL_FO_XSL)
+MYSQL_FO_XSL_DEPS = $(MYSQL_FO_XSL) \
+	$(XSL_DIR)/mysql.formalpara.templates.fo.xsl
 
 # Transform that extracts <remark> elements
 


Modified: trunk/xsl.d/mysql-fo.xsl
===================================================================
--- trunk/xsl.d/mysql-fo.xsl	2007-01-15 01:15:24 UTC (rev 4503)
+++ trunk/xsl.d/mysql-fo.xsl	2007-01-15 03:28:15 UTC (rev 4504)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 498 bytes

@@ -17,7 +17,7 @@
 
   <!-- Import custom formalpara templates (used for special notices) -->
   
-  <xsl:import href="mysql.formalpara.templates.fo.xsl"/>
+  <xsl:include href="mysql.formalpara.templates.fo.xsl"/>
   
   <xsl:include href="mysql.titlepage.templates.fo.xsl"/>
  


Modified: trunk/xsl.d/mysql-html-section.xsl
===================================================================
--- trunk/xsl.d/mysql-html-section.xsl	2007-01-15 01:15:24 UTC (rev 4503)
+++ trunk/xsl.d/mysql-html-section.xsl	2007-01-15 03:28:15 UTC (rev 4504)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 570 bytes

@@ -9,7 +9,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
 <xsl:import href="docbook-xsl/html/chunkfast.xsl"/>
-<xsl:import href="mysql.formalpara.templates.html.xsl"/>
+<xsl:include href="mysql.formalpara.templates.html.xsl"/>
 
 <xsl:include href="mysql-disclaimer-html.xsl"/>
 


Modified: trunk/xsl.d/mysql-html.xsl
===================================================================
--- trunk/xsl.d/mysql-html.xsl	2007-01-15 01:15:24 UTC (rev 4503)
+++ trunk/xsl.d/mysql-html.xsl	2007-01-15 03:28:15 UTC (rev 4504)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 553 bytes

@@ -8,7 +8,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
 <xsl:import href="docbook-xsl/html/docbook.xsl"/>
-<xsl:import href="mysql.formalpara.templates.html.xsl"/>
+<xsl:include href="mysql.formalpara.templates.html.xsl"/>
 
 <xsl:output method="html" encoding="utf-8" indent="no"/>