r3834 - in jhalfs/trunk/BLFS: . xsl

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Wed Nov 18 02:54:14 PST 2015


Author: pierre
Date: Wed Nov 18 02:54:13 2015
New Revision: 3834

Log:
Adjustements for non-versioned packages:
- allows xorg-env to be a dependency although it is a sect2 id
- remove the ban on xorg-env in dependencies.xsl
- directly call the template mode="normal" for modules, since there are
  no special cases in this case.
- treat all sect1 s, even if they do not have a xreflabel.

Modified:
   jhalfs/trunk/BLFS/gen-special.sh
   jhalfs/trunk/BLFS/xsl/dependencies.xsl
   jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl

Modified: jhalfs/trunk/BLFS/gen-special.sh
==============================================================================
--- jhalfs/trunk/BLFS/gen-special.sh	Tue Nov 17 12:22:04 2015	(r3833)
+++ jhalfs/trunk/BLFS/gen-special.sh	Wed Nov 18 02:54:13 2015	(r3834)
@@ -78,8 +78,13 @@
         <xsl:text>&#xA;      </xsl:text>
       </package><xsl:text>&#xA;</xsl:text>
     </xsl:when>
-<!-- Although versioned, this page is not a package -->
-    <xsl:when test="@id='xorg7'"/>
+<!-- Although versioned, this page is not a package. But
+     the sect2 with id "xorg-env" is referred to at several
+     places in the book. We have added it to the list of non
+     versioned packages. -->
+    <xsl:when test="@id='xorg7'">
+      <xsl:apply-templates select="child::sect2" mode="special"/>
+    </xsl:when>
 EOF
 
 # Non-versionned packages. Add to NV_LIST if you need more.

Modified: jhalfs/trunk/BLFS/xsl/dependencies.xsl
==============================================================================
--- jhalfs/trunk/BLFS/xsl/dependencies.xsl	Tue Nov 17 12:22:04 2015	(r3833)
+++ jhalfs/trunk/BLFS/xsl/dependencies.xsl	Wed Nov 18 02:54:13 2015	(r3834)
@@ -55,7 +55,6 @@
     <xsl:param name="priority"/>
     <xsl:variable name="depname">
       <xsl:choose>
-        <xsl:when test="@name='xorg-env'"/>
         <xsl:when test="@name='x-window-system'">xinit</xsl:when>
         <xsl:when test="@name='xorg7'">xinit</xsl:when>
         <xsl:when test="@name='server-mail'">

Modified: jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl
==============================================================================
--- jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl	Tue Nov 17 12:22:04 2015	(r3833)
+++ jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl	Wed Nov 18 02:54:13 2015	(r3834)
@@ -64,7 +64,7 @@
           <xsl:value-of select="title"/>
         </xsl:element>
         <xsl:text>&#xA;</xsl:text>
-        <xsl:apply-templates select=".//sect1[@xreflabel]">
+        <xsl:apply-templates select=".//sect1">
           <xsl:sort select="@id"/>
         </xsl:apply-templates>
       <xsl:text>    </xsl:text>
@@ -92,17 +92,14 @@
             <xsl:value-of select="title"/>
             </xsl:element>
           <xsl:text>&#xA;</xsl:text>
-<!-- Do not use .//*, which would include self.
-     Calls the template of specialCases.xsl,
-     which calls the "normal" template when the
-     case is normal. -->
+<!-- Do not use .//*, which would include self. -->
           <xsl:apply-templates
             select="descendant::node()[contains(translate(@xreflabel,
                                                          '123456789',
                                                          '000000000'),
                                                 '-0')    
                                       ]"
-            mode="special">
+            mode="normal">
             <xsl:sort select="@id"/>
           </xsl:apply-templates>
           <xsl:text>      </xsl:text>


More information about the alfs-log mailing list