From 297591545818b43f2c248ed36644a7353b268bd1 Mon Sep 17 00:00:00 2001
From: Alain Reguera Delgado <al@centos.org.cu>
Date: Nov 08 2013 23:09:56 +0000
Subject: Update image directory used inside documentation.


- Previously, when documentation was rendered using the render module,
  the Images link pointed to Artworks/Icons/Webenv directory. However,
  the current implementation of render module stores final images in
  the Artworks/Icons/Webenv/Final directory. This update changes the
  asciidoc_setXhtmlRendition function to use
  Artworks/Icons/Webenv/Final directory as source location instead of
  Artworks/Icons/Webenv directory.

- Previously, when documentation was rendered using the render module,
  callout images were stored inside Artworks/Icons/Webenv/Callouts
  directory. In order to reuse the Artwork/Icons/Webenv/Final
  directory, callouts were moved out of Callouts directory and stored
  directly inside Artwork/Icons/Webenv/. This update changes the
  callout.graphics.path definition inside XSL files to use callout
  images stored inside Artwork/Icons/Webenv/Final directory instead of
  Artwork/Icons/Webenv/Callouts directory. As consequence, the
  Artworks/Icons/Webenv/Callouts directory was removed.

---

diff --git a/Artworks/Webenv/Docbook/1.69.1/Xsl/docbook2xhtml-chunks.xsl b/Artworks/Webenv/Docbook/1.69.1/Xsl/docbook2xhtml-chunks.xsl
index 4078222..7ed98ef 100755
--- a/Artworks/Webenv/Docbook/1.69.1/Xsl/docbook2xhtml-chunks.xsl
+++ b/Artworks/Webenv/Docbook/1.69.1/Xsl/docbook2xhtml-chunks.xsl
@@ -15,7 +15,7 @@
     <xsl:param name="section.label.includes.component.label" select="1"></xsl:param>
     <xsl:param name="admon.graphics" select="1"></xsl:param>
     <xsl:param name="admon.graphics.path">Images/</xsl:param>
-    <xsl:param name="callout.graphics.path" select="'Images/Callouts/'"></xsl:param>
+    <xsl:param name="callout.graphics.path" select="'Images/'"></xsl:param>
 
     <!-- 
     Don't print toc inside reference pages.
diff --git a/Artworks/Webenv/Docbook/1.69.1/Xsl/docbook2xhtml-single.xsl b/Artworks/Webenv/Docbook/1.69.1/Xsl/docbook2xhtml-single.xsl
index 2b607e1..e4d7b49 100755
--- a/Artworks/Webenv/Docbook/1.69.1/Xsl/docbook2xhtml-single.xsl
+++ b/Artworks/Webenv/Docbook/1.69.1/Xsl/docbook2xhtml-single.xsl
@@ -13,6 +13,6 @@
     <xsl:param name="section.label.includes.component.label" select="1"></xsl:param>
     <xsl:param name="admon.graphics" select="1"></xsl:param>
     <xsl:param name="admon.graphics.path">Images/</xsl:param>
-    <xsl:param name="callout.graphics.path" select="'Images/Callouts/'"></xsl:param>
+    <xsl:param name="callout.graphics.path" select="'Images/'"></xsl:param>
 
 </xsl:stylesheet>
diff --git a/Automation/Modules/Render/Modules/Files/Modules/Asciidoc/asciidoc_setXhtmlRendition.sh b/Automation/Modules/Render/Modules/Files/Modules/Asciidoc/asciidoc_setXhtmlRendition.sh
index e3a77a7..bbe02e8 100755
--- a/Automation/Modules/Render/Modules/Files/Modules/Asciidoc/asciidoc_setXhtmlRendition.sh
+++ b/Automation/Modules/Render/Modules/Files/Modules/Asciidoc/asciidoc_setXhtmlRendition.sh
@@ -33,11 +33,11 @@ function asciidoc_setXhtmlRendition {
     if [[ -z ${RENDER_PAGES} ]];then
         RENDER_PAGES='single'
     fi
-    tcar_checkFiles -m '^(single|chunks)$' "${RENDER_PAGES}"
+    tcar_checkFiles -m '^(single-notoc|single|chunks)$' "${RENDER_PAGES}"
 
     IMAGES_FROM=$(tcar_getConfigValue "${CONFIGURATION}" "${SECTION}" "images-from")
     if [[ -z ${IMAGES_FROM} ]];then
-        IMAGES_FROM="${TCAR_BASEDIR}/Artworks/Icons/Webenv"
+        IMAGES_FROM="${TCAR_BASEDIR}/Artworks/Icons/Webenv/Final"
     fi
 
     STYLES_FROM=$(tcar_getConfigValue "${CONFIGURATION}" "${SECTION}" "styles-from")