Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package suse-xsl-stylesheets for
openSUSE:Factory checked in at 2024-03-25 21:06:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-xsl-stylesheets (Old)
and /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-xsl-stylesheets"
Mon Mar 25 21:06:13 2024 rev:79 rq:1161281 version:2.94.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/suse-xsl-stylesheets/suse-xsl-stylesheets.changes
2024-03-20 21:10:20.177110651 +0100
+++
/work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new.1905/suse-xsl-stylesheets.changes
2024-03-25 21:06:49.138142909 +0100
@@ -1,0 +2,12 @@
+Mon Mar 25 06:55:54 UTC 2024 - Thomas Schraitle <[email protected]> -
2.94.3
+
+- Update 2.94.3
+ * Fix handling of external JSON-LD generation (#617)
+ Additionally, this commit changes:
+
+ * Add language into external JSON-LD filename
+ * Take into account rootid parameter for filename
+ * Enable JSON-LD structure for HTML by default
+ * Correct social media length (#615)
+
+-------------------------------------------------------------------
Old:
----
suse-xsl-2.94.2.tar.bz2
New:
----
suse-xsl-2.94.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-xsl-stylesheets.spec ++++++
--- /var/tmp/diff_new_pack.Nx440b/_old 2024-03-25 21:06:49.818167895 +0100
+++ /var/tmp/diff_new_pack.Nx440b/_new 2024-03-25 21:06:49.818167895 +0100
@@ -22,7 +22,7 @@
%define suse_styles_dir %{db_xml_dir}/stylesheet
#
Name: suse-xsl-stylesheets
-Version: 2.94.2
+Version: 2.94.3
Release: 0
Summary: SUSE-Branded Stylesheets for DocBook
License: GPL-2.0-only OR GPL-3.0-only
++++++ suse-xsl-2.94.2.tar.bz2 -> suse-xsl-2.94.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-2.94.2/ChangeLog
new/suse-xsl-2.94.3/ChangeLog
--- old/suse-xsl-2.94.2/ChangeLog 2024-03-19 13:47:40.000000000 +0100
+++ new/suse-xsl-2.94.3/ChangeLog 2024-03-25 07:50:49.000000000 +0100
@@ -1,4 +1,15 @@
-------------------------------------------------------------------
+Mon Mar 25 06:48:35 UTC 2024 - [email protected]
+
+- Update 2.94.3
+ * Fix handling of external JSON-LD generation (#617)
+ Additionally, this commit changes:
+
+ * Add language into external JSON-LD filename
+ * Take into account rootid parameter for filename
+ * Enable JSON-LD structure for HTML by default
+ * Correct social media length (#615)
+-------------------------------------------------------------------
Tue Mar 19 12:47:24 UTC 2024 - [email protected]
- Update 2.94.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-2.94.2/suse2022-ns/xhtml/chunk.xsl
new/suse-xsl-2.94.3/suse2022-ns/xhtml/chunk.xsl
--- old/suse-xsl-2.94.2/suse2022-ns/xhtml/chunk.xsl 2024-03-19
13:47:40.000000000 +0100
+++ new/suse-xsl-2.94.3/suse2022-ns/xhtml/chunk.xsl 2024-03-25
07:50:49.000000000 +0100
@@ -39,4 +39,26 @@
<xsl:param name="is.chunk" select="1"/>
+
+ <xsl:template match="/">
+ <xsl:apply-imports/>
+ <xsl:choose>
+ <xsl:when test="$dcfilename != ''">
+ <xsl:call-template name="generate-json-ld-external">
+ <xsl:with-param name="node" select="*[1]" />
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="log.message">
+ <xsl:with-param name="level">WARN</xsl:with-param>
+ <xsl:with-param name="context-desc">
+ <xsl:text>JSON-LD</xsl:text>
+ </xsl:with-param>
+ <xsl:with-param name="message">
+ <xsl:text>The parameter $dcfilename is unset. Cannot create the
external JSON file.</xsl:text>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
</xsl:stylesheet>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-2.94.2/suse2022-ns/xhtml/docbook.xsl
new/suse-xsl-2.94.3/suse2022-ns/xhtml/docbook.xsl
--- old/suse-xsl-2.94.2/suse2022-ns/xhtml/docbook.xsl 2024-03-19
13:47:40.000000000 +0100
+++ new/suse-xsl-2.94.3/suse2022-ns/xhtml/docbook.xsl 2024-03-25
07:50:49.000000000 +0100
@@ -701,10 +701,11 @@
<!-- ############################################################## -->
-
- <xsl:template match="/" mode="process.root">
+ <!-- This template is called when creating single HTML -->
+ <xsl:template match="/">
<xsl:apply-imports/>
- <xsl:choose>
+ <xsl:if test="$is.chunk = 0">
+ <xsl:choose>
<xsl:when test="$dcfilename != ''">
<xsl:call-template name="generate-json-ld-external">
<xsl:with-param name="node" select="." />
@@ -722,6 +723,7 @@
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
+ </xsl:if>
</xsl:template>
<xsl:template match="*" mode="process.root">
@@ -1026,5 +1028,4 @@
</aside>
</xsl:template>
-
</xsl:stylesheet>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-2.94.2/suse2022-ns/xhtml/json-ld.xsl
new/suse-xsl-2.94.3/suse2022-ns/xhtml/json-ld.xsl
--- old/suse-xsl-2.94.2/suse2022-ns/xhtml/json-ld.xsl 2024-03-19
13:47:40.000000000 +0100
+++ new/suse-xsl-2.94.3/suse2022-ns/xhtml/json-ld.xsl 2024-03-25
07:50:49.000000000 +0100
@@ -218,7 +218,10 @@
</xsl:variable>
<xsl:variable name="file" select="substring-after($dcfile, 'DC-')"/>
<xsl:choose>
- <xsl:when test="$base != ''">
+ <xsl:when test="$base != '' and $rootid != ''">
+ <xsl:value-of select="concat($rootid, $json-ld.ext)"/>
+ </xsl:when>
+ <xsl:when test="$base != '' and $rootid = ''">
<xsl:value-of select="concat($base, $json-ld.ext)"/>
</xsl:when>
<xsl:otherwise>
@@ -233,6 +236,9 @@
</xsl:variable>
<xsl:if test="$generate.json-ld.external != 0">
+ <xsl:variable name="lang">
+ <xsl:call-template name="l10n.language"/>
+ </xsl:variable>
<!--
<xsl:message>Going to write external JSON-LD structure to
"<xsl:value-of
select="$filename"/>" for <xsl:value-of select="local-name($node)"/>
@@ -242,8 +248,10 @@
filename="<xsl:value-of select="$filename"/>"
</xsl:message>
-->
+
+ <!-- We take into account the language as well -->
<xsl:call-template name="write.chunk">
- <xsl:with-param name="filename" select="concat($json-ld-base.dir,
$filename)"/>
+ <xsl:with-param name="filename" select="concat($json-ld-base.dir,
$lang, '-', $filename)"/>
<xsl:with-param name="quiet" select="0"/>
<xsl:with-param name="method">text</xsl:with-param>
<xsl:with-param name="doctype-public"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-2.94.2/suse2022-ns/xhtml/param.xsl
new/suse-xsl-2.94.3/suse2022-ns/xhtml/param.xsl
--- old/suse-xsl-2.94.2/suse2022-ns/xhtml/param.xsl 2024-03-19
13:47:40.000000000 +0100
+++ new/suse-xsl-2.94.3/suse2022-ns/xhtml/param.xsl 2024-03-25
07:50:49.000000000 +0100
@@ -460,7 +460,7 @@
<xsl:param
name="include.ssi.footer">/docserv/fragments/suseparts/footer_{{#language#}}.html</xsl:param>
<!-- Should we generate a JSON-LD structure? 0=no, 1=yes -->
- <xsl:param name="generate.json-ld" select="0"/>
+ <xsl:param name="generate.json-ld" select="1"/>
<!-- Should we generate an external JSON-LD structure 0=no, 1=yes
Only works when $generate.json-ld=1 was set
-->
