* [gentoo-commits] proj/devmanual:master commit in: /, xsl/
@ 2024-10-28 17:12 Ulrich Müller
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2024-10-28 17:12 UTC (permalink / raw
To: gentoo-commits
commit: 18c1d5bd22f885c90e440ea408700285bb20165d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 17:05:51 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 17:05:51 2024 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=18c1d5bd
xsl: Drop the xmlns=xhtml attribute from all stylesheet elements
This caused some HTML elements to contain spurious xmlns attributes,
e.g. in quickstart/index.html:
<span xmlns="http://www.w3.org/1999/xhtml" class="Statement">dodoc</span>
Apparently this is valid in HTML 5, so neither tidy nor the W3C
validator would warn about it (and it went unnoticed since 2015):
"In HTML documents, elements in the HTML namespace may have an xmlns
attribute specified, if, and only if, it has the exact value
'http://www.w3.org/1999/xhtml'."
https://html.spec.whatwg.org/multipage/dom.html#global-attributes
Use single and double quotes consistently. Whitespace fixes.
Fixes: bf60a8772d3ece409e2fbe0b4dd8b5a5dd7df167
Fixes: e918c7dc8268c4a4723ab4b3a35479f4d191a765
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
depend.xsl | 11 ++++++-----
devbook.xsl | 24 ++++++++++++++----------
xsl/lang.highlight.c.xsl | 12 ++++++------
xsl/lang.highlight.ebuild.xsl | 12 ++++++------
xsl/lang.highlight.m4.xsl | 12 ++++++------
xsl/lang.highlight.make.xsl | 12 ++++++------
xsl/lang.highlight.sgml.xsl | 12 ++++++------
xsl/str.tokenize.function.xsl | 13 ++++++-------
8 files changed, 56 insertions(+), 52 deletions(-)
diff --git a/depend.xsl b/depend.xsl
index 15c5e15..71e4969 100644
--- a/depend.xsl
+++ b/depend.xsl
@@ -1,9 +1,10 @@
<?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="str exslt xsl"
- exclude-result-prefixes="str exslt xsl">
+<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="str exslt xsl"
+ exclude-result-prefixes="str exslt xsl">
<xsl:import href="devbook.xsl"/>
<xsl:output method="text"/>
diff --git a/devbook.xsl b/devbook.xsl
index a10f5ab..4895290 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -1,9 +1,10 @@
<?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="str exslt xsl"
- exclude-result-prefixes="str exslt xsl">
+<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="str exslt xsl"
+ exclude-result-prefixes="str exslt xsl">
<xsl:import href="xsl/str.tokenize.function.xsl"/>
<xsl:import href="xsl/lang.highlight.c.xsl"/>
@@ -19,8 +20,7 @@
<xsl:param name="offline" select="0"/>
<xsl:variable name="newline">
-<xsl:text>
-</xsl:text>
+ <xsl:text>
</xsl:text>
</xsl:variable>
<xsl:template match="chapter">
@@ -128,7 +128,7 @@
<xsl:for-each select="str:tokenize_plasmaroo(., $newline)">
<xsl:choose>
<xsl:when test=". = $newline">
- <xsl:if test="position() != 1"><xsl:value-of select='$newline'/></xsl:if>
+ <xsl:if test="position() != 1"><xsl:value-of select="$newline"/></xsl:if>
<xsl:if test="$numbering = 'lines' and position() != last()-1">
<span style="float: left;"><xsl:number format="01"/>:<xsl:text> </xsl:text></span>
</xsl:if>
@@ -444,7 +444,7 @@
<xsl:param name="extraction_counting"/>
<xsl:variable name="doc_self" select="concat($path, 'text.xml')"/>
- <xsl:if test="count(document($doc_self)/guide/include) > 0 and ($depth < $maxdepth or $maxdepth = '0')">
+ <xsl:if test="count(document($doc_self)/guide/include) > 0 and ($depth < $maxdepth or $maxdepth = 0)">
<xsl:choose>
<xsl:when test="$extraction_counting = 1">
<xsl:for-each select="document($doc_self)/guide/include">
@@ -740,7 +740,11 @@
<script src="https://assets.gentoo.org/tyrian/jquery.min.js"/>
<script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"/>
<script src="https://assets.gentoo.org/lunr/lunr.min.js"/>
- <script>var documentsSrc = "<xsl:value-of select="$relative_path_depth_recursion"/>documents.js"</script>
+ <script>
+ <xsl:text>var documentsSrc = "</xsl:text>
+ <xsl:value-of select="$relative_path_depth_recursion"/>
+ <xsl:text>documents.js"</xsl:text>
+ </script>
<script src="{$relative_path_depth_recursion}search.js"/>
</xsl:if>
</body>
diff --git a/xsl/lang.highlight.c.xsl b/xsl/lang.highlight.c.xsl
index f1e5937..5d724c4 100644
--- a/xsl/lang.highlight.c.xsl
+++ b/xsl/lang.highlight.c.xsl
@@ -1,10 +1,10 @@
<?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="str exslt xsl"
- exclude-result-prefixes="str exslt xsl"
- xmlns="http://www.w3.org/1999/xhtml">
+<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="str exslt xsl"
+ exclude-result-prefixes="str exslt xsl">
<xsl:template name="lang.highlight.c.subtokenate">
<xsl:param name="data"/>
diff --git a/xsl/lang.highlight.ebuild.xsl b/xsl/lang.highlight.ebuild.xsl
index f615393..b41c44b 100644
--- a/xsl/lang.highlight.ebuild.xsl
+++ b/xsl/lang.highlight.ebuild.xsl
@@ -1,10 +1,10 @@
<?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="str exslt xsl"
- exclude-result-prefixes="str exslt xsl"
- xmlns="http://www.w3.org/1999/xhtml">
+<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="str exslt xsl"
+ exclude-result-prefixes="str exslt xsl">
<xsl:variable name="lang.highlight.ebuild.qvariable-start">$</xsl:variable>
<xsl:variable name="lang.highlight.ebuild.variable-start">${</xsl:variable>
diff --git a/xsl/lang.highlight.m4.xsl b/xsl/lang.highlight.m4.xsl
index 9d75967..4918fb9 100644
--- a/xsl/lang.highlight.m4.xsl
+++ b/xsl/lang.highlight.m4.xsl
@@ -1,10 +1,10 @@
<?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="str exslt xsl"
- exclude-result-prefixes="str exslt xsl"
- xmlns="http://www.w3.org/1999/xhtml">
+<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="str exslt xsl"
+ exclude-result-prefixes="str exslt xsl">
<xsl:template name="lang.highlight.m4.subtokenate">
<xsl:param name="data"/>
diff --git a/xsl/lang.highlight.make.xsl b/xsl/lang.highlight.make.xsl
index dbc082a..f8930c4 100644
--- a/xsl/lang.highlight.make.xsl
+++ b/xsl/lang.highlight.make.xsl
@@ -1,10 +1,10 @@
<?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="str exslt xsl"
- exclude-result-prefixes="str exslt xsl"
- xmlns="http://www.w3.org/1999/xhtml">
+<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="str exslt xsl"
+ exclude-result-prefixes="str exslt xsl">
<xsl:template name="lang.highlight.make.subtokenate">
<xsl:param name="data"/>
diff --git a/xsl/lang.highlight.sgml.xsl b/xsl/lang.highlight.sgml.xsl
index bdd06b7..f88e502 100644
--- a/xsl/lang.highlight.sgml.xsl
+++ b/xsl/lang.highlight.sgml.xsl
@@ -1,10 +1,10 @@
<?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="str exslt xsl"
- exclude-result-prefixes="str exslt xsl"
- xmlns="http://www.w3.org/1999/xhtml">
+<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="str exslt xsl"
+ exclude-result-prefixes="str exslt xsl">
<xsl:template name="lang.highlight.sgml.subtokenate">
<xsl:param name="data"/>
diff --git a/xsl/str.tokenize.function.xsl b/xsl/str.tokenize.function.xsl
index 3c3275d..8fc452c 100644
--- a/xsl/str.tokenize.function.xsl
+++ b/xsl/str.tokenize.function.xsl
@@ -5,11 +5,10 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:func="http://exslt.org/functions"
- xmlns:exsl="http://exslt.org/common"
+ xmlns:exslt="http://exslt.org/common"
xmlns:str="http://exslt.org/strings"
- extension-element-prefixes="str func exsl xsl"
- exclude-result-prefixes="str func exsl xsl"
- xmlns="http://www.w3.org/1999/xhtml">
+ extension-element-prefixes="str func exslt xsl"
+ exclude-result-prefixes="str func exslt xsl">
<func:function name="str:tokenize_plasmaroo">
<xsl:param name="string" select="''" />
@@ -18,9 +17,9 @@
<xsl:when test="not($string)">
<func:result select="/.." />
</xsl:when>
- <xsl:when test="not(function-available('exsl:node-set'))">
+ <xsl:when test="not(function-available('exslt:node-set'))">
<xsl:message terminate="yes">
- ERROR: EXSLT - Functions implementation of str:tokenize relies on exsl:node-set().
+ ERROR: EXSLT - Functions implementation of str:tokenize relies on exslt:node-set().
</xsl:message>
</xsl:when>
<xsl:otherwise>
@@ -39,7 +38,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <func:result select="exsl:node-set($tokens)/*" />
+ <func:result select="exslt:node-set($tokens)/*" />
</xsl:otherwise>
</xsl:choose>
</func:function>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: /, xsl/
@ 2025-10-02 20:17 Ulrich Müller
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2025-10-02 20:17 UTC (permalink / raw
To: gentoo-commits
commit: 7afe8ed82ab8be010655ed3a7880be02e55b2cb9
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 2 18:49:03 2025 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 2 18:49:03 2025 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=7afe8ed8
*.xsl: Drop "xsl" from xsl:stylesheet attributes
The "xsl" prefix is reserved, therefore it must not be listed in either
extension-element-prefixes or exclude-result-prefixes.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
depend.xsl | 4 ++--
devbook.xsl | 4 ++--
xsl/lang.highlight.c.xsl | 4 ++--
xsl/lang.highlight.ebuild.xsl | 4 ++--
xsl/lang.highlight.m4.xsl | 4 ++--
xsl/lang.highlight.make.xsl | 4 ++--
xsl/lang.highlight.sgml.xsl | 4 ++--
xsl/str.tokenize.function.xsl | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/depend.xsl b/depend.xsl
index 7ee22e6..2821e2d 100644
--- a/depend.xsl
+++ b/depend.xsl
@@ -3,8 +3,8 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
xmlns:exslt="http://exslt.org/common"
- extension-element-prefixes="str exslt xsl"
- exclude-result-prefixes="str exslt xsl">
+ extension-element-prefixes="str exslt"
+ exclude-result-prefixes="str exslt">
<xsl:import href="devbook.xsl"/>
<xsl:output method="text"/>
diff --git a/devbook.xsl b/devbook.xsl
index 31f8941..983d04f 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -3,8 +3,8 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
xmlns:exslt="http://exslt.org/common"
- extension-element-prefixes="str exslt xsl"
- exclude-result-prefixes="str exslt xsl">
+ extension-element-prefixes="str exslt"
+ exclude-result-prefixes="str exslt">
<xsl:import href="xsl/str.tokenize.function.xsl"/>
<xsl:import href="xsl/lang.highlight.c.xsl"/>
diff --git a/xsl/lang.highlight.c.xsl b/xsl/lang.highlight.c.xsl
index 5d724c4..1ddb85c 100644
--- a/xsl/lang.highlight.c.xsl
+++ b/xsl/lang.highlight.c.xsl
@@ -3,8 +3,8 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
xmlns:exslt="http://exslt.org/common"
- extension-element-prefixes="str exslt xsl"
- exclude-result-prefixes="str exslt xsl">
+ extension-element-prefixes="str exslt"
+ exclude-result-prefixes="str exslt">
<xsl:template name="lang.highlight.c.subtokenate">
<xsl:param name="data"/>
diff --git a/xsl/lang.highlight.ebuild.xsl b/xsl/lang.highlight.ebuild.xsl
index b41c44b..222ba08 100644
--- a/xsl/lang.highlight.ebuild.xsl
+++ b/xsl/lang.highlight.ebuild.xsl
@@ -3,8 +3,8 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
xmlns:exslt="http://exslt.org/common"
- extension-element-prefixes="str exslt xsl"
- exclude-result-prefixes="str exslt xsl">
+ extension-element-prefixes="str exslt"
+ exclude-result-prefixes="str exslt">
<xsl:variable name="lang.highlight.ebuild.qvariable-start">$</xsl:variable>
<xsl:variable name="lang.highlight.ebuild.variable-start">${</xsl:variable>
diff --git a/xsl/lang.highlight.m4.xsl b/xsl/lang.highlight.m4.xsl
index 4918fb9..3532a41 100644
--- a/xsl/lang.highlight.m4.xsl
+++ b/xsl/lang.highlight.m4.xsl
@@ -3,8 +3,8 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
xmlns:exslt="http://exslt.org/common"
- extension-element-prefixes="str exslt xsl"
- exclude-result-prefixes="str exslt xsl">
+ extension-element-prefixes="str exslt"
+ exclude-result-prefixes="str exslt">
<xsl:template name="lang.highlight.m4.subtokenate">
<xsl:param name="data"/>
diff --git a/xsl/lang.highlight.make.xsl b/xsl/lang.highlight.make.xsl
index f8930c4..84d4932 100644
--- a/xsl/lang.highlight.make.xsl
+++ b/xsl/lang.highlight.make.xsl
@@ -3,8 +3,8 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
xmlns:exslt="http://exslt.org/common"
- extension-element-prefixes="str exslt xsl"
- exclude-result-prefixes="str exslt xsl">
+ extension-element-prefixes="str exslt"
+ exclude-result-prefixes="str exslt">
<xsl:template name="lang.highlight.make.subtokenate">
<xsl:param name="data"/>
diff --git a/xsl/lang.highlight.sgml.xsl b/xsl/lang.highlight.sgml.xsl
index f88e502..231f241 100644
--- a/xsl/lang.highlight.sgml.xsl
+++ b/xsl/lang.highlight.sgml.xsl
@@ -3,8 +3,8 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
xmlns:exslt="http://exslt.org/common"
- extension-element-prefixes="str exslt xsl"
- exclude-result-prefixes="str exslt xsl">
+ extension-element-prefixes="str exslt"
+ exclude-result-prefixes="str exslt">
<xsl:template name="lang.highlight.sgml.subtokenate">
<xsl:param name="data"/>
diff --git a/xsl/str.tokenize.function.xsl b/xsl/str.tokenize.function.xsl
index 8fc452c..5a08191 100644
--- a/xsl/str.tokenize.function.xsl
+++ b/xsl/str.tokenize.function.xsl
@@ -7,8 +7,8 @@
xmlns:func="http://exslt.org/functions"
xmlns:exslt="http://exslt.org/common"
xmlns:str="http://exslt.org/strings"
- extension-element-prefixes="str func exslt xsl"
- exclude-result-prefixes="str func exslt xsl">
+ extension-element-prefixes="str func exslt"
+ exclude-result-prefixes="str func exslt">
<func:function name="str:tokenize_plasmaroo">
<xsl:param name="string" select="''" />
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-10-02 20:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-02 20:17 [gentoo-commits] proj/devmanual:master commit in: /, xsl/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2024-10-28 17:12 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox