Manual: Drop "build" from XSL file names

diff --git a/Docs/Manual/EN/build/build_common.xsl b/Docs/Manual/EN/xsl/common.xsl
similarity index 86%
rename from Docs/Manual/EN/build/build_common.xsl
rename to Docs/Manual/EN/xsl/common.xsl
index e7a4ab8..7c5dfe5 100644 (file)
--- a/Docs/Manual/EN/build/build_common.xsl
+++ b/Docs/Manual/EN/xsl/common.xsl
@@ -2,26 +2,11 @@
   version="1.0">
 
 <!-- ********************************************************************
-     build-common.xsl
-
      WinMerge customization of the XSL DocBook stylesheet distribution.
-     Imported by other WinMerge build*.xsl files, so they use the parameters 
+     Imported by other WinMerge *.xsl files, so they use the parameters 
      and templates here unless they have their own versions. 
-
-     Do not modify any stock template directly in the DocBook XSL library. 
-     Instead, copy the template to this file or one of the other build*.xsl 
-     files, and modify only the copy. Any custom template supersedes the  
-     stock template of the same name. 
-
-     Please put any custom template in a section that identifies the 
-     source file in the stock XSL library. That makes it easy to maintain 
-     if the DocBook stock template changes. Likewise, any new ones (not based 
-     on stock templates) should go in a section  marked, "New templates".
-     ******************************************************************** 
-     Changes
-     Created July 2008
-     3 Aug 2009: Added 'header.ads' custom template
      ******************************************************************** -->
+
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
 html/param.xsl  parameters
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  

diff --git a/Docs/Manual/EN/build/build_html.xsl b/Docs/Manual/EN/xsl/html.xsl
similarity index 92%
rename from Docs/Manual/EN/build/build_html.xsl
rename to Docs/Manual/EN/xsl/html.xsl
index aacf716..6351a3c 100644 (file)
--- a/Docs/Manual/EN/build/build_html.xsl
+++ b/Docs/Manual/EN/xsl/html.xsl
@@ -3,21 +3,14 @@
                version="1.0">
 
 <!-- ********************************************************************
-     build_html.xsl
      WinMerge customization of the XSL DocBook stylesheet distribution.
      Contains customized templates and parameters for the HTML version 
      of help; all other styles are inherited from the WinMerge 
-     build_common.xsl and the stock DocBook stylesheets in ../build/xsl. 
- 
-     See build_common.xsl for editing instructions.
-     ******************************************************************** 
-     Changes:
-     Created July 2008
-     3 Aug 2009: Added 'user.header.content' template
+     common.xsl and the stock DocBook stylesheets in ../../Shared/xsl. 
      ******************************************************************** -->
 
 <xsl:import href="../../Shared/xsl/html/chunk.xsl"/>
-<xsl:import href="build_common.xsl"/>
+<xsl:import href="common.xsl"/>
 
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
 Custom parameters

diff --git a/Docs/Manual/EN/build/build_htmlhelp.xsl b/Docs/Manual/EN/xsl/htmlhelp.xsl
similarity index 79%
rename from Docs/Manual/EN/build/build_htmlhelp.xsl
rename to Docs/Manual/EN/xsl/htmlhelp.xsl
index 14cd69e..f5d30b6 100644 (file)
--- a/Docs/Manual/EN/build/build_htmlhelp.xsl
+++ b/Docs/Manual/EN/xsl/htmlhelp.xsl
@@ -3,20 +3,14 @@
                version="1.0">
 
 <!-- ********************************************************************
-     build_htmlhelp.xsl
      WinMerge customization of the XSL DocBook stylesheet distribution.
      Contains customized templates and parameters for the HTML Help version 
      of help; all other styles are inherited from the WinMerge 
-     build_common.xsl and the stock DocBook stylesheets in ../build/xsl. 
- 
-     See build_common.xsl for editing instructions.
-     ******************************************************************** 
-     Changes:
-     Created July 2008
+     common.xsl and the stock DocBook stylesheets in ../../Shared/xsl. 
      ******************************************************************** -->
 
 <xsl:import href="../../Shared/xsl/htmlhelp/htmlhelp.xsl"/>
-<xsl:import href="build_common.xsl"/>
+<xsl:import href="common.xsl"/>
 
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
 html/param.xsl  parameters

diff --git a/Docs/Manual/JP/build/build_common.xsl b/Docs/Manual/JP/xsl/common.xsl
similarity index 83%
rename from Docs/Manual/JP/build/build_common.xsl
rename to Docs/Manual/JP/xsl/common.xsl
index dfb3c4b..7c5dfe5 100644 (file)
--- a/Docs/Manual/JP/build/build_common.xsl
+++ b/Docs/Manual/JP/xsl/common.xsl
@@ -2,26 +2,11 @@
   version="1.0">
 
 <!-- ********************************************************************
-     build-common.xsl
-
      WinMerge customization of the XSL DocBook stylesheet distribution.
-     Imported by other WinMerge build*.xsl files, so they use the parameters 
+     Imported by other WinMerge *.xsl files, so they use the parameters 
      and templates here unless they have their own versions. 
-
-     Do not modify any stock template directly in the DocBook XSL library. 
-     Instead, copy the template to this file or one of the other build*.xsl 
-     files, and modify only the copy. Any custom template supersedes the  
-     stock template of the same name. 
-
-     Please put any custom template in a section that identifies the 
-     source file in the stock XSL library. That makes it easy to maintain 
-     if the DocBook stock template changes. Likewise, any new ones (not based 
-     on stock templates) should go in a section  marked, "New templates".
-     ******************************************************************** 
-     Changes
-     Created July 2008
-     3 Aug 2009: Added 'header.ads' custom template
      ******************************************************************** -->
+
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
 html/param.xsl  parameters
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
@@ -38,9 +23,6 @@ html/param.xsl  parameters
 <xsl:param name="use.id.as.filename" select="1"/>
 <xsl:param name="chunker.output.indent" select="'yes'"></xsl:param>
 <xsl:param name="chunk.section.depth" select="0" />
-<xsl:param name="chunker.output.encoding" select="'Shift_JIS'"/>
-<xsl:param name="l10n.gentext.language" select="'ja'"/>
-<xsl:param name="l10n.gentext.default.language" select="'ja'"/>
 <xsl:param name="generate.toc">book toc,title article nop</xsl:param>
 <xsl:param name="toc.section.depth">1</xsl:param>
 <xsl:param name="runinhead.default.title.end.punct">:</xsl:param>

diff --git a/Docs/Manual/JP/build/build_html.xsl b/Docs/Manual/JP/xsl/html.xsl
similarity index 90%
rename from Docs/Manual/JP/build/build_html.xsl
rename to Docs/Manual/JP/xsl/html.xsl
index aacf716..2806905 100644 (file)
--- a/Docs/Manual/JP/build/build_html.xsl
+++ b/Docs/Manual/JP/xsl/html.xsl
@@ -3,21 +3,21 @@
                version="1.0">
 
 <!-- ********************************************************************
-     build_html.xsl
      WinMerge customization of the XSL DocBook stylesheet distribution.
      Contains customized templates and parameters for the HTML version 
      of help; all other styles are inherited from the WinMerge 
-     build_common.xsl and the stock DocBook stylesheets in ../build/xsl. 
- 
-     See build_common.xsl for editing instructions.
-     ******************************************************************** 
-     Changes:
-     Created July 2008
-     3 Aug 2009: Added 'user.header.content' template
+     common.xsl and the stock DocBook stylesheets in ../../Shared/xsl. 
      ******************************************************************** -->
 
 <xsl:import href="../../Shared/xsl/html/chunk.xsl"/>
-<xsl:import href="build_common.xsl"/>
+<xsl:import href="common.xsl"/>
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
+html/param.xsl  parameters
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
+<xsl:param name="chunker.output.encoding" select="'Shift_JIS'"/>
+<xsl:param name="l10n.gentext.language" select="'ja'"/>
+<xsl:param name="l10n.gentext.default.language" select="'ja'"/>
 
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
 Custom parameters

diff --git a/Docs/Manual/JP/build/build_htmlhelp.xsl b/Docs/Manual/JP/xsl/htmlhelp.xsl
similarity index 80%
rename from Docs/Manual/JP/build/build_htmlhelp.xsl
rename to Docs/Manual/JP/xsl/htmlhelp.xsl
index 5ad2349..8096988 100644 (file)
--- a/Docs/Manual/JP/build/build_htmlhelp.xsl
+++ b/Docs/Manual/JP/xsl/htmlhelp.xsl
@@ -3,20 +3,14 @@
                version="1.0">
 
 <!-- ********************************************************************
-     build_htmlhelp.xsl
      WinMerge customization of the XSL DocBook stylesheet distribution.
      Contains customized templates and parameters for the HTML Help version 
      of help; all other styles are inherited from the WinMerge 
-     build_common.xsl and the stock DocBook stylesheets in ../build/xsl. 
- 
-     See build_common.xsl for editing instructions.
-     ******************************************************************** 
-     Changes:
-     Created July 2008
+     common.xsl and the stock DocBook stylesheets in ../../Shared/xsl. 
      ******************************************************************** -->
 
 <xsl:import href="../../Shared/xsl/htmlhelp/htmlhelp.xsl"/>
-<xsl:import href="build_common.xsl"/>
+<xsl:import href="common.xsl"/>
 
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
 html/param.xsl  parameters

diff --git a/Docs/Manual/build_html_en.bat b/Docs/Manual/build_html_en.bat
index 60ee956..c220e5e 100644 (file)
--- a/Docs/Manual/build_html_en.bat
+++ b/Docs/Manual/build_html_en.bat
@@ -4,7 +4,7 @@ pushd %~dp0
 call configuration.bat
 
 set docbook_inputfile=EN\WinMerge_help.xml
-set docbook_use_stylesheet=EN\build\build_html.xsl
+set docbook_use_stylesheet=EN\xsl\html.xsl
 set docbook_outputdir=%docbook_build_path%\html-en
 set ads=false
 if "%1" == "withads" goto withads

diff --git a/Docs/Manual/build_html_jp.bat b/Docs/Manual/build_html_jp.bat
index d0b7083..ac71b36 100644 (file)
--- a/Docs/Manual/build_html_jp.bat
+++ b/Docs/Manual/build_html_jp.bat
@@ -4,7 +4,7 @@ pushd %~dp0
 call configuration.bat
 
 set docbook_inputfile=JP\WinMerge_help.xml
-set docbook_use_stylesheet=JP\build\build_html.xsl
+set docbook_use_stylesheet=JP\xsl\html.xsl
 set docbook_outputdir=%docbook_build_path%\html-jp
 set ads=false
 if "%1" == "withads" goto withads

diff --git a/Docs/Manual/build_htmlhelp_en.bat b/Docs/Manual/build_htmlhelp_en.bat
index ce106f3..adc708c 100644 (file)
--- a/Docs/Manual/build_htmlhelp_en.bat
+++ b/Docs/Manual/build_htmlhelp_en.bat
@@ -4,7 +4,7 @@ pushd %~dp0
 call configuration.bat
 
 set docbook_inputfile=EN\WinMerge_help.xml
-set docbook_use_stylesheet=EN\build\build_htmlhelp.xsl
+set docbook_use_stylesheet=EN\xsl\htmlhelp.xsl
 set docbook_outputdir=htmlhelp
 set docbook_outputdir_final=%docbook_build_path%\%docbook_outputdir%
 

diff --git a/Docs/Manual/build_htmlhelp_jp.bat b/Docs/Manual/build_htmlhelp_jp.bat
index 1bf060f..062caf1 100644 (file)
--- a/Docs/Manual/build_htmlhelp_jp.bat
+++ b/Docs/Manual/build_htmlhelp_jp.bat
@@ -4,7 +4,7 @@ pushd %~dp0
 call configuration.bat
 
 set docbook_inputfile=JP\WinMerge_help.xml
-set docbook_use_stylesheet=JP\build\build_htmlhelp.xsl
+set docbook_use_stylesheet=JP\xsl\htmlhelp.xsl
 set docbook_outputdir=htmlhelp
 set docbook_outputdir_final=%docbook_build_path%\%docbook_outputdir%