Changeset 1814367 for LFS/lfs.xsl

Timestamp:

03/27/2017 04:14:49 PM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, trunk

Children:

5e59386

Parents:

0ad3a33

Message:

Fix the case of the "symlinks.xml" file, which has revision attributes in sect2, which defeats a filter
based solely on screen and sect1 attributes.

File:

• LFS/lfs.xsl (modified) (1 diff)

LFS/lfs.xsl

@@ -54 +54 @@
   
   <xsl:template match="sect1">
+<!-- Since this xsl:if tag encloses the whole template, it would
+     be much better to transpose this condition to the select part
+     of the "calling" apply-template. But that would change the numbering,
+     so that it would be difficult to compare to previous versions. So for
+     version 2.4, let us keep this -->
         <xsl:if test="(../@id='chapter-temporary-tools' or
                   ../@id='chapter-building-system' or
                   ../@id='chapter-bootscripts' or
                   ../@id='chapter-bootable') and
-                  count(descendant::screen/userinput) &gt; 0 and
-                  count(descendant::screen/userinput) &gt;
-                      count(descendant::screen[@role='nodump']) and
-                  count(descendant::screen/userinput) &gt;
-                      count(descendant::screen/userinput[starts-with(string(),'chroot')])">
+                  (sect2[not(@revision) or @revision=$revision]//..|.)/
+                      screen[(not(@role) or @role != 'nodump') and
+                             (not(@revision) or @revision=$revision)]/
+                          userinput[not(starts-with(string(),'chroot'))]">
 <!-- The last condition is a hack to allow previous versions of the
      book where the chroot commands did not have role="nodump".