From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1567410-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 C1A05158089
	for <garchives@archives.gentoo.org>; Thu,  2 Nov 2023 17:06:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 9D7112BC013;
	Thu,  2 Nov 2023 17:06:10 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 pigeon.gentoo.org (Postfix) with ESMTPS id 789172BC013
	for <gentoo-commits@lists.gentoo.org>; Thu,  2 Nov 2023 17:06:10 +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 8093E335D27
	for <gentoo-commits@lists.gentoo.org>; Thu,  2 Nov 2023 17:06:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B999AA2
	for <gentoo-commits@lists.gentoo.org>; Thu,  2 Nov 2023 17:06:07 +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: <1698944591.bc2e4a7c7f83310ff46f1cf489fea0249ef63137.ulm@gentoo>
Subject: [gentoo-commits] proj/devmanual:master commit in: /
X-VCS-Repository: proj/devmanual
X-VCS-Files: Makefile depend.xsl
X-VCS-Directories: /
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: bc2e4a7c7f83310ff46f1cf489fea0249ef63137
X-VCS-Branch: master
Date: Thu,  2 Nov 2023 17:06:07 +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: e48b9860-f5a3-423a-bec3-7676ceeb551b
X-Archives-Hash: 6ca5e9d60a8f5152bd297e151762f70a

commit:     bc2e4a7c7f83310ff46f1cf489fea0249ef63137
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 17:45:02 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Nov  2 17:03:11 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=bc2e4a7c

depend.xsl: Canonicalise output paths

Convert to absolute paths in XSLT, so postprocessing with sed is
no longer needed.

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

 Makefile   |  2 +-
 depend.xsl | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 89874ae..e75cbf1 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ appendices/todo-list/index.html: $(XMLS)
 # Generate the list of dependencies with XSLT, which appears to be a
 # better tool for this than make.
 .depend: $(XMLS) eclass-reference/text.xml depend.xsl devbook.xsl
-	@xsltproc depend.xsl $(XMLS) | sed ':x;s%[^ /]*/\.\./%%;tx' > $@
+	@xsltproc depend.xsl $(XMLS) > $@
 
 install: all
 	set -e; \

diff --git a/depend.xsl b/depend.xsl
index abb139a..15c5e15 100644
--- a/depend.xsl
+++ b/depend.xsl
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
+  xmlns:str="http://exslt.org/strings"
   xmlns:exslt="http://exslt.org/common"
-  extension-element-prefixes="exslt xsl"
-  exclude-result-prefixes="exslt xsl">
+  extension-element-prefixes="str exslt xsl"
+  exclude-result-prefixes="str exslt xsl">
 
 <xsl:import href="devbook.xsl"/>
 <xsl:output method="text"/>
@@ -20,12 +21,18 @@
   <xsl:variable name="self" select="/guide/@self"/>
   <xsl:value-of select="concat($self, 'index.html:')"/>
   <xsl:for-each select="exslt:node-set($refs)//a/@href[. != '#']">
-    <!-- At this point, the path can contain ".." components and
-         should be canonicalised, but string processing in XPath 1.0
-         sucks (no pattern matching!). It is easier to pipe the output
-         through sed instead. -->
-    <xsl:value-of select="concat(' ', $self,
-        substring-before(., 'index.html'), 'text.xml')"/>
+    <xsl:text> </xsl:text>
+    <xsl:variable name="path" select="substring-before(., 'index.html')"/>
+    <!-- At this point, $path can start with zero or more ".." components
+         and is relative to $self. Convert it to an absolute path. -->
+    <xsl:variable name="up" select="count(str:tokenize($path, '/')[. = '..'])"/>
+    <xsl:for-each select="str:tokenize($self, '/')[position() &lt;= last() - $up]">
+      <xsl:value-of select="concat(., '/')"/>
+    </xsl:for-each>
+    <xsl:for-each select="str:tokenize($path, '/')[position() &gt; $up]">
+      <xsl:value-of select="concat(., '/')"/>
+    </xsl:for-each>
+    <xsl:text>text.xml</xsl:text>
   </xsl:for-each>
   <xsl:value-of select="$newline"/>
 </xsl:template>