From 26212cc9815b58939d2146da4eb3a2d30131f257 Mon Sep 17 00:00:00 2001
From: Alain Reguera Delgado <al@centos.org.cu>
Date: Nov 13 2013 04:07:46 +0000
Subject: Update asciidoc_setXhtmlRendition function.


- Previously, we were indenting markup of final html files using tidy
  program. Tuning up tasks shouldn't be written inside the render
  module. This update changes asciidoc_setXhtmlRendition function to
  call the tuneup parent module which takes care of tuning up html
  files. Tuneup module uses the xmllint program instead of tidy.

- Previously, the prepare module was considering the tidy package as
  required. This update changes the packages function to remove tidy
  from list of required packages. xmllint program is part of libxml2
  package which is already in the list of required packages.

---

diff --git a/Automation/Modules/Prepare/Modules/Packages/packages.sh b/Automation/Modules/Prepare/Modules/Packages/packages.sh
index 2e15305..17c0695 100755
--- a/Automation/Modules/Prepare/Modules/Packages/packages.sh
+++ b/Automation/Modules/Prepare/Modules/Packages/packages.sh
@@ -35,7 +35,7 @@ function packages {
         gnome-doc-utils elinks docbook-style-xsl docbook-utils
         docbook-dtds docbook-style-dsssl docbook-simple
         docbook-utils-pdf docbook-slides firefox sudo yum rpm ctags
-        vim-enhanced tidy"
+        vim-enhanced"
 
     # Define required packages used by centos-art.sh script inside
     # EPEL repository. Start verifying the package that contains
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 ababb92..a130649 100755
--- a/Automation/Modules/Render/Modules/Files/Modules/Asciidoc/asciidoc_setXhtmlRendition.sh
+++ b/Automation/Modules/Render/Modules/Files/Modules/Asciidoc/asciidoc_setXhtmlRendition.sh
@@ -68,7 +68,8 @@ function asciidoc_setXhtmlRendition {
     for RENDER_PAGE in ${RENDER_PAGES};do
         /usr/bin/xsltproc -o ${LOCATION} --nonet \
             ${DOCBOOK_XSL}/docbook2xhtml-${RENDER_PAGE}.xsl ${TARGET_INSTANCES[${COUNTER}]}
-        /usr/bin/tidy -asxhtml -utf8 -q -i -o ${LOCATION} ${LOCATION}
     done
 
+    # Tuneup markup of final html files.
+    tcar_setModuleEnvironment -m tuneup -t parent -g $(dirname ${RENDER_TARGET})
 }