From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1567987-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 21EA8158089
	for <garchives@archives.gentoo.org>; Sun,  5 Nov 2023 16:44:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 3E0D32BC015;
	Sun,  5 Nov 2023 16:44:26 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 1DFDB2BC015
	for <gentoo-commits@lists.gentoo.org>; Sun,  5 Nov 2023 16:44:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 25D24335CE9
	for <gentoo-commits@lists.gentoo.org>; Sun,  5 Nov 2023 16:44:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 86BBFC3D
	for <gentoo-commits@lists.gentoo.org>; Sun,  5 Nov 2023 16:44:23 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1699202612.bbe65af778d3201e21f0129b0864008164578e99.ulm@gentoo>
Subject: [gentoo-commits] proj/devmanual:master commit in: /
X-VCS-Repository: proj/devmanual
X-VCS-Files: devbook.xsl
X-VCS-Directories: /
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: bbe65af778d3201e21f0129b0864008164578e99
X-VCS-Branch: master
Date: Sun,  5 Nov 2023 16:44:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3bd7dae6-730a-404b-93de-06833ab68022
X-Archives-Hash: e590ea46a7c05af3f89b292734d77bab

commit:     bbe65af778d3201e21f0129b0864008164578e99
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  2 17:14:38 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Nov  5 16:43:32 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=bbe65af7

devbook.xsl: Manipulate paths in getLastNode consistently

Directory paths are used everywhere else, so append text.xml only when
actually accessing the file.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 devbook.xsl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index 626b97d..b50ecc5 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -809,12 +809,12 @@
   <!-- This function recurses forward down nodes stopping at the very last include... -->
   <xsl:param name="root"/>
   <xsl:param name="path"/>
-  <xsl:variable name="include" select="document(concat($root, $path))/guide/include[last()]/@href"/>
+  <xsl:variable name="include" select="document(concat($root, $path, 'text.xml'))/guide/include[last()]/@href"/>
   <xsl:choose>
     <xsl:when test="$include">
       <xsl:call-template name="getLastNode">
         <xsl:with-param name="root" select="$root"/>
-        <xsl:with-param name="path" select="concat(substring-before($path, 'text.xml'), $include, 'text.xml')"/>
+        <xsl:with-param name="path" select="concat($path, $include)"/>
       </xsl:call-template>
     </xsl:when>
     <xsl:otherwise>
@@ -854,15 +854,15 @@
           <xsl:variable name="myItem_path">
             <xsl:call-template name="getLastNode">
               <xsl:with-param name="root" select="$parentItem_path"/>
-              <xsl:with-param name="path" select="concat($parentItem_next, 'text.xml')"/>
+              <xsl:with-param name="path" select="$parentItem_next"/>
             </xsl:call-template>
           </xsl:variable>
           <!-- Make a relative <a> link; we need an absolute reference
                for the XSLT processor though... -->
-          <a class="w-250 text-center" href="{concat('../', substring-before($myItem_path, 'text.xml'), 'index.html')}">
+          <a class="w-250 text-center" href="{concat('../', $myItem_path, 'index.html')}">
             <span class="fa fa-arrow-left"/>
             <span class="truncated-text d-inline-block max-w-200 ml-2">
-              <xsl:value-of select="document(concat($parentItem_path, $myItem_path))/guide/chapter[1]/title"/>
+              <xsl:value-of select="document(concat($parentItem_path, $myItem_path, 'text.xml'))/guide/chapter[1]/title"/>
             </span>
           </a>
         </xsl:when>