From 7933ed76c6968e1e4a469347722ce95e3e76ff27 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Tue, 13 Aug 2019 15:03:39 +0000
Subject: [PATCH] Refactoring the output of installation instructions:

Create a template which processes the instruction tree fragment (only header
for now, the content is bogus), and call it from main sheet.
---
 .../{gen-install.xsl => process-install.xsl}   | 12 +++++++++---
 BLFS/xsl/scripts.xsl                           | 18 ++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)
 rename BLFS/xsl/{gen-install.xsl => process-install.xsl} (96%)

diff --git a/BLFS/xsl/gen-install.xsl b/BLFS/xsl/process-install.xsl
similarity index 96%
rename from BLFS/xsl/gen-install.xsl
rename to BLFS/xsl/process-install.xsl
index 7090243..65d065f 100644
--- a/BLFS/xsl/gen-install.xsl
+++ b/BLFS/xsl/process-install.xsl
@@ -3,10 +3,16 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     version="1.0">
 
-<!-- $Id$ -->
+<!-- $Id: gen-install.xsl 4107 2019-06-15 15:26:23Z pierre $ -->
+
+  <xsl:template name="process-install">
+    <xsl:param name="instruction-tree"/>
+    <xsl:param name="want-stats"/>
+    <xsl:param name="root-seen"/>
+    <xsl:param name="install-seen"/>
+    <xsl:param name="test-seen"/>
+    <xsl:param name="doc-seen"/>
 
-  <xsl:template match="screen" mode="installation">
-    <xsl:param name="want-stats" select="false"/>
 <!-- "nature" variables:
       - 'non-root': executable as user
       - 'config': execute as root, with no special formatting
diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl
index f1fabdb..a7d5f37 100644
--- a/BLFS/xsl/scripts.xsl
+++ b/BLFS/xsl/scripts.xsl
@@ -89,8 +89,9 @@ done</xsl:variable>
 
 <!-- end parameters and global variables -->
 
-<!-- include the templates for the screen children of role="install" sect2 -->
-  <xsl:include href="gen-install.xsl"/>
+<!-- include the template for processing screen children of
+     role="install" sect2 -->
+  <xsl:include href="process-install.xsl"/>
 
 <!--=================== Begin processing ========================-->
 
@@ -275,13 +276,18 @@ echo Start Time: ${SECONDS} >> $INFOLOG
 </xsl:text>
         </xsl:if>
 
-        <xsl:apply-templates
-             mode="installation"
+        <xsl:call-template name="process-install">
+          <xsl:with-param
+             name="instruction-tree"
              select=".//screen[not(@role = 'nodump') and ./userinput] |
                      .//para/command[contains(text(),'check') or
-                                     contains(text(),'test')]">
+                                     contains(text(),'test')]"/>
           <xsl:with-param name="want-stats" select="$want-stats"/>
-        </xsl:apply-templates>
+          <xsl:with-param name="root-seen" select="boolean(0)"/>
+          <xsl:with-param name="install-seen" select="boolean(0)"/>
+          <xsl:with-param name="test-seen" select="boolean(0)"/>
+          <xsl:with-param name="doc-seen" select="boolean(0)"/>
+        </xsl:call-template>
         <xsl:text>
 </xsl:text>
         <xsl:if test="$sudo = 'y'">