From 0a661b663c203be4b6210098cc27c660111d24aa Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Fri, 19 Apr 2013 21:38:09 +0000
Subject: [PATCH] Further deps modifications in order to be sure that the
 preceding page is a dep in the X chapter

---
 BLFS/xsl/gen_pkg_list.xsl | 40 +++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/BLFS/xsl/gen_pkg_list.xsl b/BLFS/xsl/gen_pkg_list.xsl
index c6d2372..6079e90 100644
--- a/BLFS/xsl/gen_pkg_list.xsl
+++ b/BLFS/xsl/gen_pkg_list.xsl
@@ -207,20 +207,32 @@
                         preceding-sibling::sect1[@id != 'xorg7'])">
             <xsl:text>
             </xsl:text>
-            <xsl:element name="dependency">
-              <xsl:attribute name="status">required</xsl:attribute>
-              <xsl:attribute name="name">
-                <xsl:choose>
-                  <xsl:when test="@id='xterm2'">xorg7-driver</xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of
-                      select="preceding-sibling::sect1[1]/@id"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:attribute>
-              <xsl:attribute name="type">ref</xsl:attribute>
-            </xsl:element>
-
+            <xsl:choose>
+              <xsl:when test="contains(preceding-sibling::sect1[1]/@id,
+                                       'xorg7-') and not(@id='printproto')">
+                <xsl:call-template name="expand-deps">
+                  <xsl:with-param name="section">
+                    <xsl:value-of select="preceding-sibling::sect1[1]/@id"/>
+                  </xsl:with-param>
+                  <xsl:with-param name="status" select="'required'"/>
+                </xsl:call-template>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:element name="dependency">
+                  <xsl:attribute name="status">required</xsl:attribute>
+                  <xsl:attribute name="name">
+                    <xsl:choose>
+                      <xsl:when test="@id='printproto'">xorg-server</xsl:when>
+                      <xsl:otherwise>
+                        <xsl:value-of
+                          select="preceding-sibling::sect1[1]/@id"/>
+                      </xsl:otherwise>
+                    </xsl:choose>
+                  </xsl:attribute>
+                  <xsl:attribute name="type">ref</xsl:attribute>
+                </xsl:element>
+              </xsl:otherwise>
+            </xsl:choose>
           </xsl:if>
           <xsl:apply-templates select=".//para[@role='required' or
                                                @role='recommended' or