From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1568459-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 53230158089
	for <garchives@archives.gentoo.org>; Mon,  6 Nov 2023 18:11:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 9D6152BC031;
	Mon,  6 Nov 2023 18:11:37 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 88AD22BC031
	for <gentoo-commits@lists.gentoo.org>; Mon,  6 Nov 2023 18:11:37 +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))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id D01E4335CEA
	for <gentoo-commits@lists.gentoo.org>; Mon,  6 Nov 2023 18:11:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A7E4AAD
	for <gentoo-commits@lists.gentoo.org>; Mon,  6 Nov 2023 18:11:35 +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: <1699294123.2c608b94d37db7706096864c67ed34772724ffc8.ulm@gentoo>
Subject: [gentoo-commits] proj/devmanual:master commit in: xsl/
X-VCS-Repository: proj/devmanual
X-VCS-Files: xsl/lang.highlight.ebuild.xsl
X-VCS-Directories: xsl/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 2c608b94d37db7706096864c67ed34772724ffc8
X-VCS-Branch: master
Date: Mon,  6 Nov 2023 18:11:35 +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: 26c760ce-6210-487e-adbf-185e37edf751
X-Archives-Hash: 6d2bf38341cdc932f8a27fb114d633d3

commit:     2c608b94d37db7706096864c67ed34772724ffc8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  4 20:43:34 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Nov  6 18:08:43 2023 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=2c608b94

lang.highlight.ebuild.xsl: Collect shell commands in a variable

Rewrap some long lines.

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

 xsl/lang.highlight.ebuild.xsl | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/xsl/lang.highlight.ebuild.xsl b/xsl/lang.highlight.ebuild.xsl
index 4dff8d1..30ccc08 100644
--- a/xsl/lang.highlight.ebuild.xsl
+++ b/xsl/lang.highlight.ebuild.xsl
@@ -11,6 +11,11 @@
   <xsl:variable name="lang.highlight.ebuild.variable-end">}</xsl:variable>
   <xsl:variable name="lang.highlight.ebuild.commentChar">#</xsl:variable>
 
+  <xsl:variable name="shell-keywords">
+    ; if then fi -ge -lt -le -gt elif else eval unset sed rm cat [[ ]] while do read done make echo cd local return for
+    case esac in -n [ ] -z -f &lt;&lt;- &gt; EOF
+  </xsl:variable>
+
   <xsl:variable name="pkg-mgr-keywords">
     <!-- Package manager commands in EAPI 0 (excluding commands banned in later EAPIs) -->
     assert best_version debug-print debug-print-function debug-print-section die diropts dobin docinto doconfd dodir
@@ -184,14 +189,9 @@
         </xsl:choose>
       </xsl:when>
 
-      <!-- Functioney highlighing -->
+      <!-- Function highlighting -->
       <!-- sh grammar -->
-      <xsl:when test="$data = ';' or $data = 'if' or $data = 'then' or $data = 'fi' or $data = '-ge' or $data = '-lt' or $data = '-le' or
-                      $data = '-gt' or $data = 'elif' or $data = 'else' or $data = 'eval' or $data = 'unset' or $data = 'sed' or
-                      $data = 'rm' or $data = 'cat' or $data = '[[' or $data = ']]' or $data = 'while' or $data = 'do' or $data = 'read' or
-                      $data = 'done' or $data = 'make' or $data = 'echo' or $data = 'cd' or $data = 'local' or $data = 'return' or
-                      $data = 'for' or $data = 'case' or $data = 'esac' or $data = 'in' or $data = '-n' or $data = '[' or $data = ']' or
-                      $data = '-z' or $data = '-f' or $data = '&lt;&lt;-' or $data = '&gt;' or $data = 'EOF'">
+      <xsl:when test="str:tokenize($shell-keywords)[$data = .]">
         <span class="Statement"><xsl:value-of select="$data"/></span>
       </xsl:when>
 
@@ -221,7 +221,8 @@
     <!-- Scan for comments. If a comment is found then this is a positional
          index that is non-zero that refers to the last node that is not
          a comment. -->
-    <xsl:variable name="commentSeeker" select="count(str:tokenize_plasmaroo(substring-before($data, concat(' ', $lang.highlight.ebuild.commentChar))))"/>
+    <xsl:variable name="commentSeeker" select="count(str:tokenize_plasmaroo(substring-before($data,
+                                               concat(' ', $lang.highlight.ebuild.commentChar))))"/>
 
     <!-- Scan for quotes... -->
     <xsl:for-each select="exslt:node-set($tokenizedData)">
@@ -232,7 +233,8 @@
       <!-- See if we should be processing comments by now; we need to test for
            two possible cases:  * commentSeeker != 0 (so we have a comment), or,
                                 * the first token is a "#" -->
-      <xsl:when test="($commentSeeker != 0 and position() &gt; $commentSeeker) or substring(../*[position()=1], 1, 1) = $lang.highlight.ebuild.commentChar or
+      <xsl:when test="($commentSeeker != 0 and position() &gt; $commentSeeker) or
+                      substring(../*[position()=1], 1, 1) = $lang.highlight.ebuild.commentChar or
                       . = $lang.highlight.ebuild.commentChar">
         <span class="Comment"><xsl:value-of select="."/></span>
       </xsl:when>