From 88b90107acd0c43eb5ec43c396346f7f5f75afef Mon Sep 17 00:00:00 2001
From: Frank Steimke <fsteimke.hb@gmail.com>
Date: Sun, 10 Mar 2024 12:31:21 +0100
Subject: [PATCH 1/3] Supports copy instructions for media files

---
 src/guide/xml/ch03.xml                       |  42 +++++++-
 src/guide/xml/ref-params.xml                 |  29 ++++-
 src/guide/xml/ref-templates.xml              |  33 +++++-
 src/main/xslt/docbook-paged.xsl              |  10 +-
 src/main/xslt/docbook.xsl                    |  19 +++-
 src/main/xslt/main.xsl                       |   1 +
 src/main/xslt/modules/chunk-output.xsl       |   2 +-
 src/main/xslt/modules/copyinstructions.xsl   | 105 +++++++++++++++++++
 src/main/xslt/modules/objects.xsl            |   5 +-
 src/main/xslt/modules/variable.xsl           |  24 +++++
 src/test/resources/xml/test/instructions.xml |   1 +
 11 files changed, 257 insertions(+), 14 deletions(-)
 create mode 100644 src/main/xslt/modules/copyinstructions.xsl
 create mode 100644 src/test/resources/xml/test/instructions.xml

diff --git a/src/guide/xml/ch03.xml b/src/guide/xml/ch03.xml
index bd72b10652..aca7c25662 100644
--- a/src/guide/xml/ch03.xml
+++ b/src/guide/xml/ch03.xml
@@ -346,11 +346,11 @@ subdirectory.
 the desired results for each combination of input and output arrangements.</para>
 
 <note>
-<para>Remember that in each case, the questions are: can the
-stylesheets find the media files to query them and are the correct
-HTML references produced? Actually copying the media files from where
-they are in the source system to where they need to be in the HTML is
-“not our problem.”</para>
+<para>Remember that in each case, the questions are: can the stylesheets find the media files to
+        query them and are the correct HTML references produced? Actually copying the media files
+        from where they are in the source system to where they need to be in the HTML is “not our
+        problem”, but the stylesheets may offer some help. See <xref
+          linkend="copyinstructions" xrefstyle="%label"/> for details.</para>
 </note>
 
 <variablelist>
@@ -504,6 +504,38 @@ for example, run:</para>
 <para>to see the results of processing “mo-3” in scenario 2. The output
 will be in the <filename>build/actual</filename> directory. The build target
 <buildtarget>all_mo_tests</buildtarget> will run them all.</para>
+  
+<section xml:id="copyinstructions">
+  <title>Copy instructions for media files</title>
+  <para>Because handling of media files can be complicated, the stylesheets may provide support
+    under certain circumstances. If the destination of the transformation is known within the
+    stylesheets, we can infer the destination for media files as well, and a script with
+    instructions for copying the media files can be created on request. If the <link
+      xlink:href="http://expath.org/spec/file">expath <code>file:copy</code> function</link> is
+    available, the copy instructions can even be executed. This is the case, for example, if you
+    are using <productname>Saxon-PE </productname>or <productname>Saxon-EE</productname>.</para>
+  <para>Two prerequisites must be met for copy instructions to be created and, if possible,
+    executed:</para>
+  <orderedlist>
+    <listitem>
+      <para>The target of the transformation must be specified with the two parameters
+          <parameter>chunk-output-base-uri</parameter> and <parameter>chunk</parameter>. In
+        other words: the support for copying media files only works for chunked output in
+        accordance with <xref linkend="chunking" xrefstyle="%label"/>. If you are not interested
+        in "chunked HTML", but prefer a single HTML file as output, you can set the parameter
+          <parameter>chunk-include</parameter> to the empty sequence <code>()</code>. You may
+        call this "fake chunking" if you want, but we have to rely on this trick because there
+        is currently no other way to determine the destination of the transformation</para>
+    </listitem>
+    <listitem>
+      <para>You must request copy instructions by setting the parameter
+          <parameter>copyinstructions-uri</parameter> to a file path. The copy instructions will be
+        written to this file.</para>
+    </listitem>
+  </orderedlist>
+  <para>The template <template>t:write-copyinstructions</template> is responsible for
+    writing the file which contains copy instructions.</para>
+</section>
 </section>
 
 <section xml:id="numeration">
diff --git a/src/guide/xml/ref-params.xml b/src/guide/xml/ref-params.xml
index ecf67aa068..dd47e0f58e 100644
--- a/src/guide/xml/ref-params.xml
+++ b/src/guide/xml/ref-params.xml
@@ -2472,6 +2472,29 @@ settings.</para>
 <para>See also <varname>table-accessibility</varname>.</para>
 </refsection>
 </refentry>
+  
+<refentry>
+  <refmeta>
+    <fieldsynopsis>
+      <type>xs:string?</type>
+      <varname>copyinstructions-uri</varname>
+    </fieldsynopsis>
+  </refmeta>
+  <refnamediv>
+    <refpurpose>URI for a file with copy instructions for media files</refpurpose>
+  </refnamediv>
+  <refsection>
+    <title>Description</title>
+    <para>You may specify the path of a file with instructions for copying media files in this
+      parameter. Please keep in mind, that support for copy-instructions for media files will only
+      work for "chunked" output, see <xref linkend="copyinstructions" xrefstyle="%label"/> for
+      details. If it is a relative path, it will be resolved against
+        <parameter>mediaobject-output-base-uri</parameter>. The template
+        <template>t:write-copyinstructions</template> is responsible for writing the file, it
+      determines the format of the "instructions".</para>
+  </refsection>
+</refentry>  
+  
 
 <refentry>
   <refmeta>
@@ -2580,8 +2603,10 @@ audio files, etc.) is complicated. See <xref linkend="mediaobject-uris"/>.
 The <parameter>mediaobject-output-base-uri</parameter> is used to compute
 the base URI of media objects in the output.
 </para>
-<para>It defaults to the empty string.
-See <varname>v:mediaobject-output-base-uri</varname>.
+<para>It defaults to the empty string. In this case,
+the <tag>img</tag> elements in the generated HTML file(s)
+will reference the mediaobject files in their original places.
+See <varname>v:mediaobject-input-base-uri</varname>.
 </para>
 </refsection>
 </refentry>
diff --git a/src/guide/xml/ref-templates.xml b/src/guide/xml/ref-templates.xml
index da040b117d..7d782fefc9 100644
--- a/src/guide/xml/ref-templates.xml
+++ b/src/guide/xml/ref-templates.xml
@@ -277,7 +277,38 @@ the element’s content.</para>
 </variablelist>
 </refsection>
 </refentry>
-
+  
+<refentry xml:id="t_write-copyinstructions">
+  <refmeta>
+    <refentrytitle>t:write-copyinstructions</refentrytitle>
+    <refmiscinfo>{http://docbook.org/ns/docbook/templates}write-copyinstructions</refmiscinfo>
+  </refmeta>
+  <refnamediv>
+    <refname>t:write-copyinstructions</refname>
+    <refpurpose>Writes a file which contains copy instructions for mediaobject files</refpurpose>
+    <refclass>template</refclass>
+  </refnamediv>
+  <refsection>
+    <title>Description</title>
+    <para>This template writes a file at <parameter>copyinstructions-uri</parameter> for copying
+      the media files in the template parameter <code>$instructions</code>, which is a non-empty
+      sequence of maps with <code>source</code> and <code>destination</code>.</para>
+    <para>The default implementation will create an XML file with <code>copyinstructions</code> as
+      root element, and one <code>copy</code> Element for each map in <code>$instructions</code>.</para>
+    <programlisting>&lt;copyinstructions&gt;
+    &lt;copy source=     &quot;file:/mnt/shared/kosit/xslTNG/src/test/resources/media/duck-small.gif&quot;
+          destination=&quot;file:/home/frank/kosit/xslTNG/test/html/duck-small.gif&quot;/&gt;
+&lt;/copyinstructions&gt;      
+    </programlisting>
+    <para>You may use a customization layer with your own implementation of this template to create a UNIX or Windows Script file.</para>
+    <para>Please note, that this templete will only be called if the expath function
+        <code>{http://expath.org/ns/file}:copy</code> is not available. Otherwise, the copy
+      instruction will pe performed by the stylesheets, in which case the file at
+        <parameter>copyinstructions-uri</parameter> will become a logfile with a slightly
+      different format.</para>
+  </refsection>
+</refentry>
+  
 <refentry xml:id="t_mediaobject-img">
 <?db filename="t_mediaobject-img"?>
 <refmeta>
diff --git a/src/main/xslt/docbook-paged.xsl b/src/main/xslt/docbook-paged.xsl
index 7342d0c73f..c49130e89f 100644
--- a/src/main/xslt/docbook-paged.xsl
+++ b/src/main/xslt/docbook-paged.xsl
@@ -117,10 +117,16 @@
     </head>
     <body>
       <xsl:copy-of select="*/@*"/>
-      <xsl:apply-templates select="*/h:header" mode="m:chunk-cleanup"/>
+      <xsl:apply-templates select="*/h:header" mode="m:chunk-cleanup">
+        <xsl:with-param name="rootbaseuri" select="$rbu" tunnel="yes"/>
+        <xsl:with-param name="chunkbaseuri" select="$cbu" tunnel="yes"/>
+      </xsl:apply-templates>
       <main>
         <xsl:apply-templates select="*/* except */h:header"
-                             mode="m:chunk-cleanup"/>
+                             mode="m:chunk-cleanup">
+          <xsl:with-param name="rootbaseuri" select="$rbu" tunnel="yes"/>
+          <xsl:with-param name="chunkbaseuri" select="$cbu" tunnel="yes"/>
+        </xsl:apply-templates>
       </main>
     </body>
   </html>
diff --git a/src/main/xslt/docbook.xsl b/src/main/xslt/docbook.xsl
index 82f9d7341e..fe5c36908e 100644
--- a/src/main/xslt/docbook.xsl
+++ b/src/main/xslt/docbook.xsl
@@ -5,7 +5,9 @@
                 xmlns:err='http://www.w3.org/2005/xqt-errors'
                 xmlns:ext="http://docbook.org/extensions/xslt"
                 xmlns:f="http://docbook.org/ns/docbook/functions"
+                xmlns:file="http://expath.org/ns/file"
                 xmlns:fp="http://docbook.org/ns/docbook/functions/private"
+                xmlns:ghost="http://docbook.org/ns/docbook/ephemeral"
                 xmlns:h="http://www.w3.org/1999/xhtml"
                 xmlns:m="http://docbook.org/ns/docbook/modes"
                 xmlns:mp="http://docbook.org/ns/docbook/modes/private"
@@ -275,7 +277,15 @@
   <xsl:variable name="result" as="document-node()">
     <xsl:sequence select="fp:run-transforms($result, $post-processing)"/>
   </xsl:variable>
-
+  
+  <xsl:call-template name="tp:mediaobjects-copyinstructions">
+    <xsl:with-param name="html" select="$result"/>
+  </xsl:call-template>
+  
+  <xsl:variable name="result" as="document-node()">
+    <xsl:apply-templates select="$result" mode="mp:final-cleanup"/>
+  </xsl:variable>
+  
   <xsl:choose>
     <xsl:when test="$return = 'raw-results'">
       <xsl:sequence select="map {
@@ -448,5 +458,10 @@
     </xsl:otherwise>
   </xsl:choose>
 </xsl:function>
+  
+<!-- mp:final-cleanup removes attributes in the ghost namespace -->
+<xsl:mode name="mp:final-cleanup" on-no-match="shallow-copy"/>
+
+<xsl:template mode="mp:final-cleanup" match="@ghost:*"/>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/xslt/main.xsl b/src/main/xslt/main.xsl
index 15c5d7001b..7141ea8d25 100644
--- a/src/main/xslt/main.xsl
+++ b/src/main/xslt/main.xsl
@@ -62,6 +62,7 @@
 <xsl:import href="modules/chunk-cleanup.xsl"/>
 <xsl:import href="modules/chunk-output.xsl"/>
 <xsl:import href="modules/xform-locale.xsl"/>
+<xsl:import href="modules/copyinstructions.xsl"/>  
 
 <xsl:output method="xhtml" encoding="utf-8" indent="no" html-version="5"
             omit-xml-declaration="yes"/>
diff --git a/src/main/xslt/modules/chunk-output.xsl b/src/main/xslt/modules/chunk-output.xsl
index 73680dc39a..66d668c23c 100644
--- a/src/main/xslt/modules/chunk-output.xsl
+++ b/src/main/xslt/modules/chunk-output.xsl
@@ -215,7 +215,7 @@
 </xsl:function>
 
 <xsl:template match="element()">
-  <xsl:copy>
+  <xsl:copy copy-namespaces="no">
     <xsl:apply-templates select="@*,node()"/>
   </xsl:copy>
 </xsl:template>
diff --git a/src/main/xslt/modules/copyinstructions.xsl b/src/main/xslt/modules/copyinstructions.xsl
new file mode 100644
index 0000000000..5b5547a3ec
--- /dev/null
+++ b/src/main/xslt/modules/copyinstructions.xsl
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:err="http://www.w3.org/2005/xqt-errors" xmlns:file="http://expath.org/ns/file"
+  xmlns:ghost="http://docbook.org/ns/docbook/ephemeral" xmlns:h="http://www.w3.org/1999/xhtml"
+  xmlns:mp="http://docbook.org/ns/docbook/modes/private"
+  xmlns:t="http://docbook.org/ns/docbook/templates"
+  xmlns:tp="http://docbook.org/ns/docbook/templates/private"
+  xmlns:v="http://docbook.org/ns/docbook/variables"
+  xmlns:vp="http://docbook.org/ns/docbook/variables/private"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all" version="3.0">
+
+  <xsl:template name="tp:mediaobjects-copyinstructions">
+    <xsl:param name="html" as="document-node()"/>
+    <xsl:message select="'v:debug= ' || string-join($v:debug,', ') || '; $debug=' || $debug"/>
+    <xsl:choose>
+      <xsl:when test="$copyinstructions-uri and exists($vp:absolute-mediaobject-output-base-uri)">
+        <xsl:variable name="instructions" as="map(*)*">
+          <xsl:apply-templates select="$html//h:img[@ghost:sourcefile]"
+            mode="mp:mediaobject-copy-instruction"/>
+        </xsl:variable>
+        <xsl:if test="exists($instructions)" use-when="function-available('file:copy')">
+          <xsl:call-template name="tp:copy-mediaobjects">
+            <xsl:with-param name="instructions" as="map(*)+" select="$instructions"/>
+          </xsl:call-template>
+        </xsl:if>
+        <xsl:if test="exists($instructions)" use-when="not(function-available('file:copy'))">
+          <xsl:call-template name="t:write-copyinstructions">
+            <xsl:with-param name="instructions" as="map(*)+" select="$instructions"/>
+          </xsl:call-template>
+        </xsl:if>
+      </xsl:when>
+      <xsl:when test="$copyinstructions-uri and not($vp:chunk-output-base-uri)">
+        <xsl:message
+          select="'Can''t construct copy instructions for mediaobjects: Don''t know absolute URI of mediaobject output base.'"
+        />
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="tp:copy-mediaobjects" use-when="function-available('file:copy')">
+    <xsl:param name="instructions" as="map(xs:string, xs:anyURI)+" required="yes"/>
+    <xsl:try>
+      <xsl:result-document href="{$vp:copyinstructions-uri}">
+        <mediaobjects xmlns="">
+          <xsl:for-each select="$instructions">
+            <xsl:try>
+              <xsl:sequence select="file:copy(.?source, .?destination)"/>
+              <copied source="{.?source}" destination="{.?destination}" result='successs'/>
+              <xsl:catch>
+                <error source="{.?source}" destination="{.?destination}">
+                  <xsl:value-of select="$err:description"/>
+                </error>
+              </xsl:catch>
+            </xsl:try>
+          </xsl:for-each>
+        </mediaobjects>
+      </xsl:result-document>
+      <xsl:message select="'Wrote ' || $vp:copyinstructions-uri" use-when="$v:debug = 'mediaobject-uris'"/>
+      <xsl:catch>
+        <xsl:message
+          select="'Unable to write copyinstructions to ' || $vp:copyinstructions-uri || ': ' || $err:description"
+        />
+      </xsl:catch>
+    </xsl:try>
+  </xsl:template>
+
+  <xsl:template name="t:write-copyinstructions">
+    <xsl:param name="instructions" as="map(xs:string, xs:anyURI)+" required="yes"/>
+    <xsl:try>
+      <xsl:result-document href="{$vp:copyinstructions-uri}">
+        <copyinstructions xmlns="">
+          <xsl:for-each select="$instructions">
+            <copy source="{.?source}" destination="{.?destination}"/>
+          </xsl:for-each>
+        </copyinstructions>
+      </xsl:result-document>
+      <xsl:message select="'Wrote ' || $vp:copyinstructions-uri" use-when="$v:debug = 'mediaobject-uris'"/>
+      <xsl:catch>
+        <xsl:message
+          select="'Unable to write copyinstructions to ' || $vp:copyinstructions-uri || ': ' || $err:description"
+        />
+      </xsl:catch>
+    </xsl:try>
+  </xsl:template>
+
+  <!-- mp:mediaobject-copy-instruction calculates for some HTML Elements a map which can support copy instructions  -->
+  <xsl:mode name="mp:mediaobject-copy-instruction"/>
+
+  <xsl:template match="h:img[@ghost:sourcefile]" mode="mp:mediaobject-copy-instruction"
+    as="map(xs:string, xs:anyURI)?">
+    <xsl:if test="exists($vp:absolute-mediaobject-output-base-uri)">
+      <xsl:variable name="destination" as="xs:anyURI" select="resolve-uri(@src, $vp:absolute-mediaobject-output-base-uri)" />
+      <xsl:message
+        select="'abs. uri (' || @src || ') &#x2192; ' || $destination" use-when="$v:debug = 'mediaobject-uris'"/>
+      <xsl:sequence select="
+          map {
+            'source': @ghost:sourcefile => xs:anyURI(),
+            'destination': $destination
+          }"/>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="node()" mode="mp:mediaobject-copy-instruction" priority="-10"/>
+
+</xsl:stylesheet>
diff --git a/src/main/xslt/modules/objects.xsl b/src/main/xslt/modules/objects.xsl
index 70c8b10094..eb8a769356 100644
--- a/src/main/xslt/modules/objects.xsl
+++ b/src/main/xslt/modules/objects.xsl
@@ -5,6 +5,7 @@
                 xmlns:ext="http://docbook.org/extensions/xslt"
                 xmlns:f="http://docbook.org/ns/docbook/functions"
                 xmlns:fp="http://docbook.org/ns/docbook/functions/private"
+                xmlns:ghost="http://docbook.org/ns/docbook/ephemeral"
                 xmlns:h="http://www.w3.org/1999/xhtml"
                 xmlns:m="http://docbook.org/ns/docbook/modes"
                 xmlns:map="http://www.w3.org/2005/xpath-functions/map"
@@ -757,6 +758,7 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:call-template name="t:mediaobject-img">
+        <xsl:with-param name="sourcefile" select="$info?uri"/>
         <xsl:with-param name="filename" select="$info?href"/>
         <xsl:with-param name="styles" select="$styles"/>
         <xsl:with-param name="viewport" select="$viewport"/>
@@ -767,12 +769,13 @@
 </xsl:template>
 
 <xsl:template name="t:mediaobject-img">
+  <xsl:param name="sourcefile" as="xs:string"/>
   <xsl:param name="filename" as="xs:string"/>
   <xsl:param name="styles" as="xs:string*"/>
   <xsl:param name="viewport" as="map(*)?"/>
   <xsl:param name="imageproperties" as="map(*)?"/>
 
-  <img src="{$filename}">
+  <img src="{$filename}" ghost:sourcefile='{$sourcefile}'>
     <xsl:apply-templates select="." mode="m:attributes"/>
     
     <!-- Apply any alt text in the media object to the image tag. -->
diff --git a/src/main/xslt/modules/variable.xsl b/src/main/xslt/modules/variable.xsl
index 654597f523..cc303641e2 100644
--- a/src/main/xslt/modules/variable.xsl
+++ b/src/main/xslt/modules/variable.xsl
@@ -104,6 +104,30 @@
                              then $mediaobject-output-base-uri
                              else $mediaobject-output-base-uri || '/'"/>
 </xsl:variable>
+  
+<xsl:variable name="vp:absolute-mediaobject-output-base-uri" as="xs:anyURI?">
+  <xsl:variable name="uri" as="xs:anyURI?">
+    <xsl:try>
+      <xsl:sequence
+        select="resolve-uri(($v:mediaobject-output-base-uri, './')[1], $vp:chunk-output-base-uri)"/>
+      <xsl:catch/>
+    </xsl:try>
+  </xsl:variable>
+  <xsl:message select="'$vp:absolute-mediaobject-output-base-uri:' || $uri"
+    use-when="'mediaobject-uris' = $v:debug"/>
+  <xsl:sequence select="$uri"/>
+</xsl:variable>  
+  
+<xsl:variable name="vp:copyinstructions-uri" as="xs:string?">
+  <xsl:if test="$copyinstructions-uri and $vp:chunk-output-base-uri">
+    <xsl:try>
+      <xsl:sequence select="resolve-uri($copyinstructions-uri, $vp:chunk-output-base-uri)"/>
+      <xsl:catch>
+        <xsl:sequence select="$copyinstructions-uri"/>
+      </xsl:catch>
+    </xsl:try>
+  </xsl:if>
+</xsl:variable>
 
 <xsl:variable name="v:mediaobject-exclude-extensions"
               select="tokenize($mediaobject-exclude-extensions, '\s+')"/>
diff --git a/src/test/resources/xml/test/instructions.xml b/src/test/resources/xml/test/instructions.xml
new file mode 100644
index 0000000000..05b363375e
--- /dev/null
+++ b/src/test/resources/xml/test/instructions.xml
@@ -0,0 +1 @@
+<mediaobjects><copied source="file:/home/frank/kosit/xslTNG/src/test/resources/media/duck-small.gif" destination="file:/home/frank/kosit/xslTNG/test/html/duck-small.gif" result="successs"></copied></mediaobjects>
\ No newline at end of file

From 6b79f26ae467ea353dbb4ad42be2a30432d9785e Mon Sep 17 00:00:00 2001
From: Frank Steimke <fsteimke.hb@gmail.com>
Date: Tue, 14 May 2024 07:25:09 +0200
Subject: [PATCH 2/3] Removed own debug message

---
 src/main/xslt/modules/copyinstructions.xsl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/xslt/modules/copyinstructions.xsl b/src/main/xslt/modules/copyinstructions.xsl
index 5b5547a3ec..076f805548 100644
--- a/src/main/xslt/modules/copyinstructions.xsl
+++ b/src/main/xslt/modules/copyinstructions.xsl
@@ -11,7 +11,6 @@
 
   <xsl:template name="tp:mediaobjects-copyinstructions">
     <xsl:param name="html" as="document-node()"/>
-    <xsl:message select="'v:debug= ' || string-join($v:debug,', ') || '; $debug=' || $debug"/>
     <xsl:choose>
       <xsl:when test="$copyinstructions-uri and exists($vp:absolute-mediaobject-output-base-uri)">
         <xsl:variable name="instructions" as="map(*)*">

From 79505c2de1eab55dae403c37d7ad511e51a5b25e Mon Sep 17 00:00:00 2001
From: Frank Steimke <fsteimke.hb@gmail.com>
Date: Thu, 16 May 2024 22:39:32 +0200
Subject: [PATCH 3/3] resolve img/@src against chunk-output-base-uri

---
 src/main/xslt/modules/copyinstructions.xsl | 10 +++++-----
 src/main/xslt/modules/variable.xsl         | 13 -------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/main/xslt/modules/copyinstructions.xsl b/src/main/xslt/modules/copyinstructions.xsl
index 076f805548..bc5d560f85 100644
--- a/src/main/xslt/modules/copyinstructions.xsl
+++ b/src/main/xslt/modules/copyinstructions.xsl
@@ -12,7 +12,7 @@
   <xsl:template name="tp:mediaobjects-copyinstructions">
     <xsl:param name="html" as="document-node()"/>
     <xsl:choose>
-      <xsl:when test="$copyinstructions-uri and exists($vp:absolute-mediaobject-output-base-uri)">
+      <xsl:when test="$copyinstructions-uri and exists($vp:chunk-output-base-uri)">
         <xsl:variable name="instructions" as="map(*)*">
           <xsl:apply-templates select="$html//h:img[@ghost:sourcefile]"
             mode="mp:mediaobject-copy-instruction"/>
@@ -28,9 +28,9 @@
           </xsl:call-template>
         </xsl:if>
       </xsl:when>
-      <xsl:when test="$copyinstructions-uri and not($vp:chunk-output-base-uri)">
+      <xsl:when test="$copyinstructions-uri">
         <xsl:message
-          select="'Can''t construct copy instructions for mediaobjects: Don''t know absolute URI of mediaobject output base.'"
+          select="'Can''t construct copy instructions for mediaobjects: Don''t know absolute URI of chunk output base.'"
         />
       </xsl:when>
     </xsl:choose>
@@ -87,8 +87,8 @@
 
   <xsl:template match="h:img[@ghost:sourcefile]" mode="mp:mediaobject-copy-instruction"
     as="map(xs:string, xs:anyURI)?">
-    <xsl:if test="exists($vp:absolute-mediaobject-output-base-uri)">
-      <xsl:variable name="destination" as="xs:anyURI" select="resolve-uri(@src, $vp:absolute-mediaobject-output-base-uri)" />
+    <xsl:if test="exists($vp:chunk-output-base-uri)">
+      <xsl:variable name="destination" as="xs:anyURI" select="resolve-uri(@src, $vp:chunk-output-base-uri)" />
       <xsl:message
         select="'abs. uri (' || @src || ') &#x2192; ' || $destination" use-when="$v:debug = 'mediaobject-uris'"/>
       <xsl:sequence select="
diff --git a/src/main/xslt/modules/variable.xsl b/src/main/xslt/modules/variable.xsl
index cc303641e2..719b0865b5 100644
--- a/src/main/xslt/modules/variable.xsl
+++ b/src/main/xslt/modules/variable.xsl
@@ -103,19 +103,6 @@
                         else if (ends-with($mediaobject-output-base-uri, '/'))
                              then $mediaobject-output-base-uri
                              else $mediaobject-output-base-uri || '/'"/>
-</xsl:variable>
-  
-<xsl:variable name="vp:absolute-mediaobject-output-base-uri" as="xs:anyURI?">
-  <xsl:variable name="uri" as="xs:anyURI?">
-    <xsl:try>
-      <xsl:sequence
-        select="resolve-uri(($v:mediaobject-output-base-uri, './')[1], $vp:chunk-output-base-uri)"/>
-      <xsl:catch/>
-    </xsl:try>
-  </xsl:variable>
-  <xsl:message select="'$vp:absolute-mediaobject-output-base-uri:' || $uri"
-    use-when="'mediaobject-uris' = $v:debug"/>
-  <xsl:sequence select="$uri"/>
 </xsl:variable>  
   
 <xsl:variable name="vp:copyinstructions-uri" as="xs:string?">