diff --git a/ChangeLog b/ChangeLog index 38a700eb..66364fc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,19 @@ ------------------------------------------------------------------- -Fr Aug 01 16:00:00 UTC 2015 - sknorr@suse.de +Thu Aug 04 18:00:00 UTC 2016 - sknorr@suse.de -Stable release DAPS 2.0.6: +Stable release of the SUSE XSL stylesheets 2.0.6.1: + +Find issues in our GitHub tracker at +https://github.com/openSUSE/suse-xsl/issues/NUMBER + +* Stylesheets (XHTML) + - Fixed style of
elements + - Turned of syntax highlighting in cases where it is unexpected + +------------------------------------------------------------------- +Mon Aug 01 16:00:00 UTC 2016 - sknorr@suse.de + +Stable release of the SUSE XSL stylesheets 2.0.6: Find issues in our GitHub tracker at https://github.com/openSUSE/suse-xsl/issues/NUMBER @@ -41,11 +53,10 @@ https://github.com/openSUSE/suse-xsl/issues/NUMBER PDF builds in the build service - Removed mentions of schemas from spec file (see top) - ------------------------------------------------------------------- -Fr Apr 22 09:00:00 UTC 2015 - toms@opensuse.org +Fri Apr 22 09:00:00 UTC 2016 - toms@opensuse.org -Stable release DAPS 2.0.5: +Stable release of the SUSE XSL stylesheets 2.0.5: Find issues in our GitHub tracker at https://github.com/openSUSE/suse-xsl/issues/NUMBER @@ -97,11 +108,10 @@ https://github.com/openSUSE/suse-xsl/issues/NUMBER - suse_beta => suse2013 - Improve package description in Spec file - ------------------------------------------------------------------- Tue Dec 02 13:41:00 UTC 2015 - toms@opensuse.org -Stable release DAPS 2.0.4: +Stable release of the SUSE XSL stylesheets 2.0.4: Find issues in our GitHub tracker at https://github.com/openSUSE/suse-xsl/issues/NUMBER @@ -142,7 +152,7 @@ https://github.com/openSUSE/suse-xsl/issues/NUMBER ------------------------------------------------------------------- Tue Aug 11 15:11:52 UTC 2015 - toms@opensuse.org -Stable release 2.0.3 (only for OBS): +Stable release of the SUSE XSL stylesheets 2.0.3 (only for OBS): - Schema: . Fixed #41: Missing prompt element @@ -158,7 +168,7 @@ Stable release 2.0.3 (only for OBS): ------------------------------------------------------------------- Tue Jul 02 09:11:00 UTC 2015 - toms@opensuse.org -Stable release 2.0.1 +Stable release of the SUSE XSL stylesheets 2.0.1 - Schema . Enabled subtitle and textobject (susedoc5.rnc) @@ -176,7 +186,7 @@ Stable release 2.0.1 ------------------------------------------------------------------- Fri Jun 19 12:47:56 UTC 2015 - fsundermeyer@opensuse.org -Stable release 2.0 +Stable release of the SUSE XSL stylesheets 2.0 - added latest products to .js file to create correct Bugzilla links in Draft mode diff --git a/Makefile b/Makefile index 7f4ba308..43682f37 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ endif SHELL := /bin/bash PACKAGE := suse-xsl-stylesheets # HINT: Also raise version number in packaging/suse-xsl-stylesheets.spec -VERSION := 2.0.6 +VERSION := 2.0.6.1 CDIR := $(shell pwd) DIST_EXCLUDES := packaging/exclude-files_for_susexsl_package.txt SUSE_XML_PATH := $(PREFIX)/xml/suse diff --git a/README.adoc b/README.adoc index a378ad54..d1e9b7d4 100644 --- a/README.adoc +++ b/README.adoc @@ -1,5 +1,5 @@ -SUSE XSL Stylesheets 2.0.6 -========================== +SUSE XSL Stylesheets 2.0.6.1 +============================ Thomas Schraitle <toms@opensuse.org> :numbered: diff --git a/packaging/suse-xsl-stylesheets.spec b/packaging/suse-xsl-stylesheets.spec index 08792f43..4f1873e4 100644 --- a/packaging/suse-xsl-stylesheets.spec +++ b/packaging/suse-xsl-stylesheets.spec @@ -17,7 +17,7 @@ Name: suse-xsl-stylesheets -Version: 2.0.6 +Version: 2.0.6.1 Release: 0 ############################################################### diff --git a/suse2013/xhtml/docbook.xsl b/suse2013/xhtml/docbook.xsl index bfeba7e9..78a01a8e 100644 --- a/suse2013/xhtml/docbook.xsl +++ b/suse2013/xhtml/docbook.xsl @@ -683,7 +683,6 @@ $(document).ready(function() { hljs.configure({ useBR: false }); -hljs.initHighlightingOnLoad(); ]]> </xsl:text> </script> diff --git a/suse2013/xhtml/sections.xsl b/suse2013/xhtml/sections.xsl index e9513061..55d47e9c 100644 --- a/suse2013/xhtml/sections.xsl +++ b/suse2013/xhtml/sections.xsl @@ -236,6 +236,46 @@ <xsl:call-template name="debug.filename-id"/> </xsl:template> +<!-- Fix up the output of section elements to look like the output of sectX +elements, to fix their display. --> +<xsl:template match="section" mode="common.html.attributes"> + <xsl:variable name="section" select="."/> + + <xsl:variable name="renderas"> + <xsl:choose> + <xsl:when test="$section/@renderas = 'sect1'">1</xsl:when> + <xsl:when test="$section/@renderas = 'sect2'">2</xsl:when> + <xsl:when test="$section/@renderas = 'sect3'">3</xsl:when> + <xsl:when test="$section/@renderas = 'sect4'">4</xsl:when> + <xsl:when test="$section/@renderas = 'sect5'">5</xsl:when> + <xsl:otherwise><xsl:value-of select="''"/></xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="level"> + <xsl:choose> + <xsl:when test="$renderas != ''"> + <xsl:value-of select="$renderas"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="section.level"> + <xsl:with-param name="node" select="$section"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="class" select="concat('sect',$level)"/> + <xsl:variable name="inherit" select="0"/> + <xsl:call-template name="generate.html.lang"/> + <xsl:call-template name="dir"> + <xsl:with-param name="inherit" select="$inherit"/> + </xsl:call-template> + <xsl:apply-templates select="." mode="class.attribute"> + <xsl:with-param name="class" select="$class"/> + </xsl:apply-templates> +</xsl:template> + <!-- Hook for additional customizations --> <xsl:template name="create.header.line"> <xsl:param name="object" select="."/>