From d1e9c57a4771fbc2c4e987ce6c67a3dd11f4b8b0 Mon Sep 17 00:00:00 2001
From: Jirka Kosek <jirka@kosek.cz>
Date: Tue, 23 Sep 2003 08:55:43 +0000
Subject: [PATCH] Added new parameter manifest.in.base.dir which can be used to
 place manifest file and also project files for HTML Help and Eclipse Help
 into base.dir. This improvement also fixes bug (feature) #662955.

---
 xsl/eclipse/eclipse.xsl             | 14 ++++++++--
 xsl/html/Makefile.param             |  1 +
 xsl/html/html.xsl                   |  4 ++-
 xsl/html/manifest.xsl               | 22 +++++++++++++---
 xsl/html/param.ent                  |  1 +
 xsl/html/param.xweb                 |  2 ++
 xsl/htmlhelp/htmlhelp-common.xsl    | 41 ++++++++++++++++++++++++-----
 xsl/params/manifest.in.base.dir.xml | 24 +++++++++++++++++
 8 files changed, 97 insertions(+), 12 deletions(-)
 create mode 100755 xsl/params/manifest.in.base.dir.xml

diff --git a/xsl/eclipse/eclipse.xsl b/xsl/eclipse/eclipse.xsl
index 28855a376..e77c24d73 100644
--- a/xsl/eclipse/eclipse.xsl
+++ b/xsl/eclipse/eclipse.xsl
@@ -43,7 +43,12 @@
 
 <xsl:template name="etoc">
   <xsl:call-template name="write.chunk">
-    <xsl:with-param name="filename" select="'toc.xml'"/>
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="'toc.xml'"/>
+    </xsl:with-param>
     <xsl:with-param name="method" select="'xml'"/>
     <xsl:with-param name="encoding" select="'utf-8'"/>
     <xsl:with-param name="indent" select="'yes'"/>
@@ -128,7 +133,12 @@
 
 <xsl:template name="plugin.xml">
   <xsl:call-template name="write.chunk">
-    <xsl:with-param name="filename" select="'plugin.xml'"/>
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="'plugin.xml'"/>
+    </xsl:with-param>
     <xsl:with-param name="method" select="'xml'"/>
     <xsl:with-param name="encoding" select="'utf-8'"/>
     <xsl:with-param name="indent" select="'yes'"/>
diff --git a/xsl/html/Makefile.param b/xsl/html/Makefile.param
index 39dc6998d..2307b54bd 100644
--- a/xsl/html/Makefile.param
+++ b/xsl/html/Makefile.param
@@ -125,6 +125,7 @@ PARAMS=../params/admon.graphics.xml \
        ../params/make.valid.html.xml \
        ../params/make.year.ranges.xml \
        ../params/manifest.xml \
+       ../params/manifest.in.base.dir.xml \
        ../params/manual.toc.xml \
        ../params/navig.graphics.xml \
        ../params/navig.graphics.extension.xml \
diff --git a/xsl/html/html.xsl b/xsl/html/html.xsl
index 588cedb09..4fdf9833b 100644
--- a/xsl/html/html.xsl
+++ b/xsl/html/html.xsl
@@ -45,7 +45,9 @@
 
 <xsl:template name="href.target.with.base.dir">
   <xsl:param name="object" select="."/>
-  <xsl:value-of select="$base.dir"/>
+  <xsl:if test="$manifest.in.base.dir = 0">
+    <xsl:value-of select="$base.dir"/>
+  </xsl:if>
   <xsl:call-template name="href.target">
     <xsl:with-param name="object" select="$object"/>
   </xsl:call-template>
diff --git a/xsl/html/manifest.xsl b/xsl/html/manifest.xsl
index 73fff7ce0..e43ad3cac 100644
--- a/xsl/html/manifest.xsl
+++ b/xsl/html/manifest.xsl
@@ -3,10 +3,18 @@
 		version="1.0"
                 exclude-result-prefixes="doc">
 
+<xsl:variable name="manifest.base.dir">
+</xsl:variable>
+
 <xsl:template name="generate.manifest">
   <xsl:param name="node" select="/"/>
   <xsl:call-template name="write.text.chunk">
-    <xsl:with-param name="filename" select="$manifest"/>
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$manifest"/>
+    </xsl:with-param>
     <xsl:with-param name="method" select="'text'"/>
     <xsl:with-param name="content">
       <xsl:apply-templates select="$node" mode="enumerate-files"/>
@@ -28,7 +36,11 @@
   <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
   <xsl:if test="$ischunk='1'">
     <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir" select="$base.dir"/>
+      <xsl:with-param name="base.dir">
+        <xsl:if test="$manifest.in.base.dir = 0">
+          <xsl:value-of select="$base.dir"/>
+        </xsl:if>
+      </xsl:with-param>
       <xsl:with-param name="base.name">
         <xsl:apply-templates mode="chunk-filename" select="."/>
       </xsl:with-param>
@@ -42,7 +54,11 @@
   <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
   <xsl:if test="$generate.legalnotice.link != 0">
     <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir" select="$base.dir"/>
+      <xsl:with-param name="base.dir">
+        <xsl:if test="$manifest.in.base.dir = 0">
+          <xsl:value-of select="$base.dir"/>
+        </xsl:if>
+      </xsl:with-param>
       <xsl:with-param name="base.name" select="concat('ln-',$id,$html.ext)"/>
     </xsl:call-template>
     <xsl:text>&#10;</xsl:text>
diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 3fb518ee2..80c080451 100644
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -125,6 +125,7 @@
 <!ENTITY make.valid.html SYSTEM "../params/make.valid.html.xml">
 <!ENTITY make.year.ranges SYSTEM "../params/make.year.ranges.xml">
 <!ENTITY manifest SYSTEM "../params/manifest.xml">
+<!ENTITY manifest.in.base.dir SYSTEM "../params/manifest.in.base.dir.xml">
 <!ENTITY manual.toc SYSTEM "../params/manual.toc.xml">
 <!ENTITY navig.graphics SYSTEM "../params/navig.graphics.xml">
 <!ENTITY navig.graphics.extension SYSTEM "../params/navig.graphics.extension.xml">
diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index 71f371699..2adf154b6 100644
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -291,6 +291,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 &base.dir;
 &generate.manifest;
 &manifest;
+&manifest.in.base.dir;
 &chunk.toc;
 &chunk.tocs.and.lots;
 &chunk.section.depth;
@@ -546,6 +547,7 @@ around all these parameters.</para>
 <src:fragref linkend="make.valid.html.frag"/>
 <src:fragref linkend="make.year.ranges.frag"/>
 <src:fragref linkend="manifest.frag"/>
+<src:fragref linkend="manifest.in.base.dir.frag"/>
 <src:fragref linkend="manual.toc.frag"/>
 <src:fragref linkend="menuchoice.menu.separator.frag"/>
 <src:fragref linkend="menuchoice.separator.frag"/>
diff --git a/xsl/htmlhelp/htmlhelp-common.xsl b/xsl/htmlhelp/htmlhelp-common.xsl
index 1db6fe82c..fa2f0ffcd 100644
--- a/xsl/htmlhelp/htmlhelp-common.xsl
+++ b/xsl/htmlhelp/htmlhelp-common.xsl
@@ -62,7 +62,12 @@
 
 <xsl:template name="hhp">
   <xsl:call-template name="write.text.chunk">
-    <xsl:with-param name="filename" select="$htmlhelp.hhp"/>
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.hhp"/>
+    </xsl:with-param>
     <xsl:with-param name="method" select="'text'"/>
     <xsl:with-param name="content">
       <xsl:call-template name="hhp-main"/>
@@ -80,7 +85,11 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.dir" select="$base.dir"/>
+        <xsl:with-param name="base.dir">
+          <xsl:if test="$manifest.in.base.dir = 0">
+            <xsl:value-of select="$base.dir"/>
+          </xsl:if>
+        </xsl:with-param>
         <xsl:with-param name="base.name">
           <xsl:choose>
             <xsl:when test="$rootid != ''">
@@ -407,7 +416,12 @@ Title=</xsl:text>
 
 <xsl:template name="hhc">
   <xsl:call-template name="write.text.chunk">
-    <xsl:with-param name="filename" select="$htmlhelp.hhc"/>
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.hhc"/>
+    </xsl:with-param>
     <xsl:with-param name="method" select="'text'"/>
     <xsl:with-param name="content">
       <xsl:call-template name="hhc-main"/>
@@ -861,7 +875,12 @@ Title=</xsl:text>
 
 <xsl:template name="hhk">
   <xsl:call-template name="write.text.chunk">
-    <xsl:with-param name="filename" select="$htmlhelp.hhk"/>
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.hhk"/>
+    </xsl:with-param>
     <xsl:with-param name="method" select="'text'"/>
     <xsl:with-param name="content"><xsl:text disable-output-escaping="yes"><![CDATA[<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <HTML>
@@ -978,7 +997,12 @@ Title=</xsl:text>
 
 <xsl:template name="hh-map">
   <xsl:call-template name="write.text.chunk">
-    <xsl:with-param name="filename" select="$htmlhelp.map.file"/>
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.map.file"/>
+    </xsl:with-param>
     <xsl:with-param name="method" select="'text'"/>
     <xsl:with-param name="content">
      <xsl:choose>
@@ -1022,7 +1046,12 @@ Title=</xsl:text>
 
 <xsl:template name="hh-alias">
   <xsl:call-template name="write.text.chunk">
-    <xsl:with-param name="filename" select="$htmlhelp.alias.file"/>
+    <xsl:with-param name="filename">
+      <xsl:if test="$manifest.in.base.dir != 0">
+        <xsl:value-of select="$base.dir"/>
+      </xsl:if>
+      <xsl:value-of select="$htmlhelp.alias.file"/>
+    </xsl:with-param>
     <xsl:with-param name="method" select="'text'"/>
     <xsl:with-param name="content">
      <xsl:choose>
diff --git a/xsl/params/manifest.in.base.dir.xml b/xsl/params/manifest.in.base.dir.xml
new file mode 100755
index 000000000..d8f2423de
--- /dev/null
+++ b/xsl/params/manifest.in.base.dir.xml
@@ -0,0 +1,24 @@
+<refentry id="manifest.in.base.dir">
+<refmeta>
+<refentrytitle>manifest.in.base.dir</refentrytitle>
+<refmiscinfo role="type">boolean</refmiscinfo>
+</refmeta>
+<refnamediv>
+<refname>manifest.in.base.dir</refname>
+<refpurpose>Should be manifest file written in $base.dir?</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='manifest.in.base.dir.frag'>
+<xsl:param name="manifest.in.base.dir" select="0"/>
+</src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>If non-zero manifest file and project files for HTML Help and
+Eclipse Help are written into <parameter>base.dir</parameter> instead
+of current directory.</para>
+
+</refsect1>
+</refentry>
-- 
2.50.1