Hello community,
here is the log from the commit of package suse-xsl-stylesheets for
openSUSE:Factory checked in at 2014-04-16 07:43:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-xsl-stylesheets (Old)
and /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-xsl-stylesheets"
Changes:
--------
---
/work/SRC/openSUSE:Factory/suse-xsl-stylesheets/suse-xsl-stylesheets.changes
2014-01-14 21:52:04.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new/suse-xsl-stylesheets.changes
2014-04-16 07:43:59.000000000 +0200
@@ -1,0 +2,19 @@
+Tue Apr 15 11:14:36 UTC 2014 - rsalev...@suse.com
+
+Version 2.0~beta3:
+
+- 2013 Stylesheets
+ * PDF output: Hyphenate URLs as workaround for FOP issue (daps#135)
+ * HTML output: When using --meta, output only one file name per
+ information box
+ * HTML output: Support for os="hidden"
+ * HTML output: light frames for figures
+
+- 2005 Stylesheets:
+ * HTML output: When using --meta, multiple file names would sometimes
+ erroneously be output in the information boxes
+
+- Novdoc:
+ * Add some basic missing attributes to uri element
+
+-------------------------------------------------------------------
Old:
----
suse-xsl-stylesheets-2.0~beta2.tar.bz2
New:
----
suse-xsl-stylesheets-2.0~beta3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-xsl-stylesheets.spec ++++++
--- /var/tmp/diff_new_pack.XjIzHj/_old 2014-04-16 07:44:00.000000000 +0200
+++ /var/tmp/diff_new_pack.XjIzHj/_new 2014-04-16 07:44:00.000000000 +0200
@@ -17,7 +17,7 @@
Name: suse-xsl-stylesheets
-Version: 2.0~beta2
+Version: 2.0~beta3
Release: 0
###############################################################
++++++ suse-xsl-stylesheets-2.0~beta2.tar.bz2 ->
suse-xsl-stylesheets-2.0~beta3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/schema/novdocx.dtd
new/suse-xsl-stylesheets/schema/novdocx.dtd
--- old/suse-xsl-stylesheets/schema/novdocx.dtd 2013-12-16 14:32:27.000000000
+0100
+++ new/suse-xsl-stylesheets/schema/novdocx.dtd 2014-03-13 10:43:54.000000000
+0100
@@ -1006,6 +1006,12 @@
%profiling.attributes;
%xmlbase;>
+<!ATTLIST uri
+ type CDATA #IMPLIED
+ role CDATA #IMPLIED
+ %profiling.attributes;
+ %xmlbase;>
+
<!ATTLIST variablelist
id ID #IMPLIED
%profiling.attributes;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2005/xhtml/sections.xsl
new/suse-xsl-stylesheets/xslt2005/xhtml/sections.xsl
--- old/suse-xsl-stylesheets/xslt2005/xhtml/sections.xsl 2012-04-11
13:10:06.000000000 +0200
+++ new/suse-xsl-stylesheets/xslt2005/xhtml/sections.xsl 2014-03-20
14:50:58.000000000 +0100
@@ -19,7 +19,7 @@
self::sect1 or
self::sect2 or
self::sect3 or
- self::sect4]/@xml:base"/>
+ self::sect4][1]/@xml:base"/>
<xsl:if test="$draft.mode = 'yes' and $xmlbase != ''">
<div class="filenameblock">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/fo/docbook.xsl
new/suse-xsl-stylesheets/xslt2013/fo/docbook.xsl
--- old/suse-xsl-stylesheets/xslt2013/fo/docbook.xsl 2013-12-16
16:18:23.000000000 +0100
+++ new/suse-xsl-stylesheets/xslt2013/fo/docbook.xsl 2014-03-10
11:47:56.000000000 +0100
@@ -54,12 +54,12 @@
<xsl:include href="admon.xsl"/>
<xsl:include href="component.xsl"/>
<xsl:include href="block.xsl"/>
+ <xsl:include href="hyphenate-url.xsl"/>
<xsl:include href="titlepage.xsl"/>
<xsl:include href="titlepage.templates.xsl"/>
<xsl:include href="pagesetup.xsl"/>
-
<xsl:include href="lists.xsl"/>
<xsl:include href="l10n.properties.xsl"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/fo/formal.xsl
new/suse-xsl-stylesheets/xslt2013/fo/formal.xsl
--- old/suse-xsl-stylesheets/xslt2013/fo/formal.xsl 2013-09-03
19:09:41.000000000 +0200
+++ new/suse-xsl-stylesheets/xslt2013/fo/formal.xsl 2014-01-29
15:29:25.000000000 +0100
@@ -22,6 +22,112 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+ <!-- Hopefully, a future version of the DocBook stylesheets will feature a
+ more
+ stomachable version of this template, in which case we can simply move
our
+ modification to not use example.properties except when ...[FIXME] -->
+ <xsl:template name="formal.object">
+ <xsl:param name="placement" select="'before'"/>
+
+ <xsl:variable name="id">
+ <xsl:call-template name="object.id"/>
+ </xsl:variable>
+
+ <xsl:variable name="content">
+ <xsl:if test="$placement = 'before'">
+ <xsl:call-template name="formal.object.heading">
+ <xsl:with-param name="placement" select="$placement"/>
+ </xsl:call-template>
+ </xsl:if>
+ <fo:block>
+ <!-- The equivalent of div.complex-example in HTML-->
+ <xsl:if test="self::example">
+ <xsl:if test="glosslist|bibliolist|itemizedlist|orderedlist|
+ segmentedlist|simplelist|variablelist|programlistingco|
+ screenco|screenshot|cmdsynopsis|funcsynopsis|
+ classsynopsis|fieldsynopsis|constructorsynopsis|
+ destructorsynopsis|methodsynopsis|formalpara|para|
+ simpara|address|blockquote|graphicco|mediaobjectco|
+ indexterm|beginpage">
+ <xsl:attribute name="border-left"
+ ><xsl:value-of select="&mediumline;"/>mm solid
&light-gray;</xsl:attribute>
+ <xsl:attribute name="margin-left"
+ ><xsl:value-of select="&mediumline; div 2"/>mm</xsl:attribute>
+ <!-- This is seemingly illogical... but looks better with both
FOP and
+ XEP. -->
+ <xsl:attribute name="padding-left"
+ ><xsl:value-of select="&columnfragment;"/>mm</xsl:attribute>
+ </xsl:if>
+ </xsl:if>
+ <xsl:apply-templates/>
+ </fo:block>
+ <xsl:if test="$placement != 'before'">
+ <xsl:call-template name="formal.object.heading">
+ <xsl:with-param name="placement" select="$placement"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:variable>
+
+ <xsl:variable name="keep.together">
+ <xsl:call-template name="pi.dbfo_keep-together"/>
+ </xsl:variable>
+
+ <xsl:choose>
+ <!-- tables have their own templates and
+ are not handled by formal.object -->
+ <xsl:when test="self::figure">
+ <fo:block id="{$id}"
+ xsl:use-attribute-sets="figure.properties">
+ <xsl:if test="$keep.together != ''">
+ <xsl:attribute name="keep-together.within-column"><xsl:value-of
+ select="$keep.together"/></xsl:attribute>
+ </xsl:if>
+ <xsl:copy-of select="$content"/>
+ </fo:block>
+ </xsl:when>
+ <xsl:when test="self::example">
+ <fo:block id="{$id}"
+ xsl:use-attribute-sets="example.properties">
+ <xsl:if test="$keep.together != ''">
+ <xsl:attribute name="keep-together.within-column"><xsl:value-of
+ select="$keep.together"/></xsl:attribute>
+ </xsl:if>
+ <xsl:copy-of select="$content"/>
+ </fo:block>
+ </xsl:when>
+ <xsl:when test="self::equation">
+ <fo:block id="{$id}"
+ xsl:use-attribute-sets="equation.properties">
+ <xsl:if test="$keep.together != ''">
+ <xsl:attribute name="keep-together.within-column"><xsl:value-of
+ select="$keep.together"/></xsl:attribute>
+ </xsl:if>
+ <xsl:copy-of select="$content"/>
+ </fo:block>
+ </xsl:when>
+ <xsl:when test="self::procedure">
+ <fo:block id="{$id}"
+ xsl:use-attribute-sets="procedure.properties">
+ <xsl:if test="$keep.together != ''">
+ <xsl:attribute name="keep-together.within-column"><xsl:value-of
+ select="$keep.together"/></xsl:attribute>
+ </xsl:if>
+ <xsl:copy-of select="$content"/>
+ </fo:block>
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:block id="{$id}"
+ xsl:use-attribute-sets="formal.object.properties">
+ <xsl:if test="$keep.together != ''">
+ <xsl:attribute name="keep-together.within-column"><xsl:value-of
+ select="$keep.together"/></xsl:attribute>
+ </xsl:if>
+ <xsl:copy-of select="$content"/>
+ </fo:block>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
<xsl:template
match="procedure|example|table|figure|variablelist|itemizedlist|orderedlist"
mode="object.label.template">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/fo/hyphenate-url.xsl
new/suse-xsl-stylesheets/xslt2013/fo/hyphenate-url.xsl
--- old/suse-xsl-stylesheets/xslt2013/fo/hyphenate-url.xsl 1970-01-01
01:00:00.000000000 +0100
+++ new/suse-xsl-stylesheets/xslt2013/fo/hyphenate-url.xsl 2014-03-10
11:47:56.000000000 +0100
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: hyphenate-url.xsl 43839 2009-08-31 14:50:03Z toms $ -->
+<!DOCTYPE xsl:stylesheet >
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+ xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+
+<!--
+ Template hyphenate-url: Prepare URL to be hyphenated
+
+ Parameters:
+ * url: The respective URL
+ * removestartslash: Remove a start slash, if available?
+ * removeendslash: Remove the trailing slash, if available?
+ * insertendslash: Insert a slash at the end of the hyphenated URL?
+-->
+<xsl:template name="hyphenate-url">
+ <xsl:param name="url" select="''"/>
+ <xsl:param name="removestartslash" select="true()"/>
+ <xsl:param name="removeendslash" select="true()"/>
+ <xsl:param name="insertendslash" select="false()"/>
+
+ <xsl:variable name="normalurl" select="normalize-space($url)"/>
+
+ <!--
+ The variables A and B can only hold 0 (zero) or 1. These are precalculated
+ indices for start (A) and end (B), used by the substring function.
+ This is used to avoid nasty linebreaks between a text and a '/'
+ character when the URL touches almost the right text margin.
+ -->
+ <xsl:variable name="A" select="starts-with($url, '/') and
+ $removestartslash and $normalurl != '/'"/>
+ <xsl:variable name="B" select="(substring($url, string-length($url), 1) =
'/')
+ and $removeendslash and $normalurl != '/'"/>
+ <xsl:variable name="len" select="string-length($normalurl)"/>
+
+
+<!-- <xsl:message> hyphenate-url:
+ url = '<xsl:value-of select="$normalurl"/>'
+ len = <xsl:value-of select="string-length($normalurl)"/>
+ A = '<xsl:value-of select="$A"/>'
+ B = '<xsl:value-of select="$B"/>'
+
+ removestartslash = '<xsl:value-of select="$removestartslash"/>'
+ C = <xsl:value-of select="string-length($normalurl) - $A - $B"/>
+ start-with= '<xsl:value-of select="starts-with($url, '/')"/>'
+ firstchar = '<xsl:value-of select="substring($normalurl, 1,1 )"/>'
+ lastchar = '<xsl:value-of select="substring($normalurl,
+ string-length($normalurl), 1)"/>'
+ substring = '<xsl:value-of select="substring($normalurl, $A +1,
+ $len - $A - $B)"/>'
+ substring3 = '<xsl:value-of select="substring($normalurl,
+ string-length(substring-before($normalurl, '://'))+4,
+ $len - string-length(
+ substring-before($normalurl, '://'))+3 - $B)"/>'
+ </xsl:message>-->
+
+
+ <xsl:choose>
+ <!-- Don't use the hyphenation algorithm at all, if
+ ulink.hyphenate is empty
+ -->
+ <xsl:when test="$ulink.hyphenate = '' or $fop1.extensions != 0">
+ <xsl:value-of select="$normalurl"/>
+ </xsl:when>
+
+ <!-- This is only executed, when you have something like "smb://".
+ If you skip this test, you get "smb:///" in the output.
+ -->
+ <xsl:when test="contains($normalurl, '://') and
+ (string-length($normalurl) -
+ string-length(substring-before($normalurl,'://')))
+ = 3
+ ">
+ <xsl:copy-of select="$normalurl"/>
+ </xsl:when>
+
+
+ <!-- Remove the "SCHEMA://" prefix, so it does not disturbs the
+ algorithm in "hyphenate-url-string" -->
+ <xsl:when test="contains($normalurl, '://')">
+ <xsl:variable name="schema"
select="substring-before($normalurl,'://')"/>
+ <xsl:variable name="core" select="substring($normalurl,
+ string-length(substring-before($normalurl, '://'))+4,
+ $len - string-length($schema) -3 - $B)"/>
+ <xsl:value-of select="$schema"/>
+ <xsl:text>://</xsl:text>
+ <xsl:copy-of select="$ulink.hyphenate"/>
+ <xsl:call-template name="hyphenate-url-string">
+ <xsl:with-param name="url" select="$core"/>
+ </xsl:call-template>
+ <xsl:if test="$B or $insertendslash">
+ <xsl:text>/</xsl:text>
+ </xsl:if>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:if test="$A">
+ <xsl:text>/</xsl:text>
+ </xsl:if>
+ <xsl:call-template name="hyphenate-url-string">
+ <xsl:with-param name="url"
+ select="substring($normalurl,
+ $A +1,
+ string-length($normalurl) - $A - $B)"/>
+ </xsl:call-template>
+ <xsl:if test="$B">
+ <xsl:text>/</xsl:text>
+ </xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<!--
+ Template hyphenate-url-string: Hyphenate URL
+
+ Parameter:
+ * url: The URL, removed from schemas like http://, ftp://, etc. and
+ a trailing slash
+-->
+<xsl:template name="hyphenate-url-string">
+ <xsl:param name="url" select="''"/>
+ <xsl:variable name="char" select="substring($url,1,1)"/>
+
+ <xsl:choose>
+ <xsl:when test="$url=''"/>
+
+ <!-- Insert breakpoint _before_ the character -->
+ <xsl:when test="contains($ulink.hyphenate.before.chars, $char)">
+ <xsl:value-of select="concat($ulink.hyphenate, $char)"/>
+ <xsl:call-template name="hyphenate-url-string">
+ <xsl:with-param name="url" select="substring($url, 2)"/>
+ </xsl:call-template>
+ </xsl:when>
+
+ <!-- Insert breakpoint _after_ the character -->
+ <xsl:when test="contains($ulink.hyphenate.after.chars, $char)">
+ <xsl:value-of select="concat($char, $ulink.hyphenate)"/>
+ <xsl:call-template name="hyphenate-url-string">
+ <xsl:with-param name="url" select="substring($url, 2)"/>
+ </xsl:call-template>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:value-of select="$char"/>
+ <xsl:call-template name="hyphenate-url-string">
+ <xsl:with-param name="url" select="substring($url, 2)"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+
+<!-- ==================================================================== -->
+<xsl:template match="filename" mode="hyphenate-url">
+ <xsl:apply-templates mode="hyphenate-url"/>
+</xsl:template>
+
+
+<xsl:template match="text()" mode="hyphenate-url">
+ <xsl:call-template name="hyphenate-url">
+ <xsl:with-param name="url" select="."/>
+ </xsl:call-template>
+</xsl:template>
+
+
+<xsl:template match="text()[preceding-sibling::replaceable]"
mode="hyphenate-url">
+ <xsl:call-template name="hyphenate-url">
+ <xsl:with-param name="url" select="."/>
+ <xsl:with-param name="removestartslash" select="false()"/>
+ </xsl:call-template>
+</xsl:template>
+
+
+<xsl:template match="replaceable" mode="hyphenate-url">
+ <xsl:call-template name="inline.italicseq">
+ <xsl:with-param name="content">
+ <xsl:call-template name="hyphenate-url">
+ <xsl:with-param name="url">
+ <xsl:apply-templates mode="hyphenate-url"/>
+ </xsl:with-param>
+ </xsl:call-template>
+ </xsl:with-param>
+ </xsl:call-template>
+</xsl:template>
+
+
+</xsl:stylesheet>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/fo/inline.xsl
new/suse-xsl-stylesheets/xslt2013/fo/inline.xsl
--- old/suse-xsl-stylesheets/xslt2013/fo/inline.xsl 2014-01-14
13:39:00.000000000 +0100
+++ new/suse-xsl-stylesheets/xslt2013/fo/inline.xsl 2014-02-07
13:29:34.000000000 +0100
@@ -30,6 +30,7 @@
xmlns:fo="http://www.w3.org/1999/XSL/Format";
xmlns:svg="http://www.w3.org/2000/svg";>
+
<xsl:template name="inline.monoseq">
<xsl:param name="content">
<xsl:call-template name="simple.xlink">
@@ -39,18 +40,29 @@
</xsl:call-template>
</xsl:param>
<xsl:param name="purpose" select="'none'"/>
- <xsl:param name="mono-ancestor" select="0"/>
+ <xsl:param name="mode" select="'normal'"/>
<xsl:param name="before" select="''"/>
<xsl:param name="after" select="''"/>
<xsl:variable name="mono-verbatim-ancestor">
- <xsl:if test="$mono-ancestor = 1 or ancestor::screen or
+ <xsl:if test="$mode = 'mono-ancestor' or ancestor::screen or
ancestor::programlisting or ancestor::synopsis">1</xsl:if>
</xsl:variable>
+ <xsl:variable name="underline-color">
+ <xsl:choose>
+ <xsl:when test="(ancestor::title and
+ not(ancestor::note or ancestor::tip or
ancestor::important or
+ ancestor::warning or ancestor::caution)) or
+ $purpose = 'xref'">
+ <xsl:value-of select="$dark-green"/>
+ </xsl:when>
+ <xsl:otherwise>&mid-gray;</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
<fo:inline xsl:use-attribute-sets="monospace.properties" font-weight="normal"
font-style="normal">
<xsl:if test="$mono-verbatim-ancestor != 1">
- <xsl:attribute name="border-bottom">&thinline;mm solid
&mid-gray;</xsl:attribute>
+ <xsl:attribute name="border-bottom">&thinline;mm solid <xsl:value-of
select="$underline-color"/></xsl:attribute>
<xsl:attribute name="padding-bottom">0.1em</xsl:attribute>
</xsl:if>
<xsl:choose>
@@ -101,18 +113,29 @@
</xsl:call-template>
</xsl:param>
<xsl:param name="purpose" select="'none'"/>
- <xsl:param name="mono-ancestor" select="0"/>
+ <xsl:param name="mode" select="'normal'"/>
<xsl:param name="before" select="''"/>
<xsl:param name="after" select="''"/>
<xsl:variable name="mono-verbatim-ancestor">
- <xsl:if test="$mono-ancestor = 1 or ancestor::screen or
+ <xsl:if test="$mode = 'mono-ancestor' or ancestor::screen or
ancestor::programlisting or ancestor::synopsis">1</xsl:if>
</xsl:variable>
+ <xsl:variable name="underline-color">
+ <xsl:choose>
+ <xsl:when test="(ancestor::title and
+ not(ancestor::note or ancestor::tip or
ancestor::important or
+ ancestor::warning or ancestor::caution)) or
+ $purpose = 'xref'">
+ <xsl:value-of select="$dark-green"/>
+ </xsl:when>
+ <xsl:otherwise>&mid-gray;</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
<fo:inline xsl:use-attribute-sets="monospace.properties mono.bold"
font-style="normal">
<xsl:if test="$mono-verbatim-ancestor != 1">
- <xsl:attribute name="border-bottom">&thinline;mm solid
&mid-gray;</xsl:attribute>
+ <xsl:attribute name="border-bottom">&thinline;mm solid <xsl:value-of
select="$underline-color"/></xsl:attribute>
<xsl:attribute name="padding-bottom">0.1em</xsl:attribute>
</xsl:if>
<xsl:choose>
@@ -163,18 +186,29 @@
</xsl:call-template>
</xsl:param>
<xsl:param name="purpose" select="'none'"/>
- <xsl:param name="mono-ancestor" select="0"/>
+ <xsl:param name="mode" select="'normal'"/>
<xsl:param name="before" select="''"/>
<xsl:param name="after" select="''"/>
<xsl:variable name="mono-verbatim-ancestor">
- <xsl:if test="$mono-ancestor = 1 or ancestor::screen or
+ <xsl:if test="$mode = 'mono-ancestor' or ancestor::screen or
ancestor::programlisting or ancestor::synopsis">1</xsl:if>
</xsl:variable>
+ <xsl:variable name="underline-color">
+ <xsl:choose>
+ <xsl:when test="(ancestor::title and
+ not(ancestor::note or ancestor::tip or
ancestor::important or
+ ancestor::warning or ancestor::caution)) or
+ $purpose = 'xref'">
+ <xsl:value-of select="$dark-green"/>
+ </xsl:when>
+ <xsl:otherwise>&mid-gray;</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
<fo:inline xsl:use-attribute-sets="monospace.properties italicized"
font-weight="normal">
<xsl:if test="$mono-verbatim-ancestor != 1">
- <xsl:attribute name="border-bottom">&thinline;mm solid
&mid-gray;</xsl:attribute>
+ <xsl:attribute name="border-bottom">&thinline;mm solid <xsl:value-of
select="$underline-color"/></xsl:attribute>
<xsl:attribute name="padding-bottom">0.1em</xsl:attribute>
</xsl:if>
<xsl:choose>
@@ -284,29 +318,33 @@
</xsl:apply-templates>
</xsl:template>
-
+<!-- No mode -->
<xsl:template match="command|userinput">
<xsl:param name="purpose" select="'none'"/>
+ <xsl:param name="mode" select="'normal'"/>
<xsl:call-template name="inline.boldmonoseq">
<xsl:with-param name="purpose" select="$purpose"/>
+ <xsl:with-param name="mode" select="$mode"/>
</xsl:call-template>
</xsl:template>
<xsl:template match="classname|exceptionname|interfacename|methodname
|computeroutput|constant|envar|filename|function|literal
|code|option|parameter|prompt|systemitem|varname|email|uri
- |cmdsynopsis/command|function|literal|package">
+ |cmdsynopsis/command|package">
<xsl:param name="purpose" select="'none'"/>
+ <xsl:param name="mode" select="'normal'"/>
<xsl:call-template name="inline.monoseq">
<xsl:with-param name="purpose" select="$purpose"/>
+ <xsl:with-param name="mode" select="$mode"/>
</xsl:call-template>
</xsl:template>
<xsl:template match="sgmltag|tag" name="sgmltag">
<xsl:param name="purpose" select="'none'"/>
- <xsl:param name="mono-ancestor" select="0"/>
+ <xsl:param name="mode" select="'normal'"/>
<xsl:variable name="class">
<xsl:if test="@class">
<xsl:value-of select="@class"/>
@@ -339,7 +377,7 @@
<xsl:call-template name="inline.monoseq">
<xsl:with-param name="purpose" select="$purpose"/>
- <xsl:with-param name="mono-ancestor" select="$mono-ancestor"/>
+ <xsl:with-param name="mode" select="$mode"/>
<xsl:with-param name="before" select="$before"/>
<xsl:with-param name="after" select="$after"/>
</xsl:call-template>
@@ -347,31 +385,35 @@
<xsl:template match="replaceable|structfield">
<xsl:param name="purpose" select="'none'"/>
+ <xsl:param name="mode" select="'normal'"/>
<xsl:call-template name="inline.italicmonoseq">
<xsl:with-param name="purpose" select="$purpose"/>
+ <xsl:with-param name="mode" select="$mode"/>
</xsl:call-template>
</xsl:template>
+
+<!-- Mode: mono-ancestor -->
<xsl:template match="command|userinput" mode="mono-ancestor">
<xsl:param name="purpose" select="'none'"/>
<xsl:call-template name="inline.boldmonoseq">
<xsl:with-param name="purpose" select="$purpose"/>
- <xsl:with-param name="mono-ancestor" select="1"/>
+ <xsl:with-param name="mode" select="'mono-ancestor'"/>
</xsl:call-template>
</xsl:template>
<xsl:template match="classname|exceptionname|interfacename|methodname
|computeroutput|constant|envar|filename|function|literal
|code|option|parameter|prompt|systemitem|varname|email|uri
- |cmdsynopsis/command|function|literal|package"
+ |cmdsynopsis/command|package"
mode="mono-ancestor">
<xsl:param name="purpose" select="'none'"/>
<xsl:call-template name="inline.monoseq">
<xsl:with-param name="purpose" select="$purpose"/>
- <xsl:with-param name="mono-ancestor" select="1"/>
+ <xsl:with-param name="mode" select="'mono-ancestor'"/>
</xsl:call-template>
</xsl:template>
@@ -380,7 +422,7 @@
<xsl:call-template name="sgmltag">
<xsl:with-param name="purpose" select="$purpose"/>
- <xsl:with-param name="mono-ancestor" select="1"/>
+ <xsl:with-param name="mode" select="'mono-ancestor'"/>
</xsl:call-template>
</xsl:template>
@@ -390,7 +432,7 @@
<xsl:call-template name="inline.italicmonoseq">
<xsl:with-param name="purpose" select="$purpose"/>
- <xsl:with-param name="mono-ancestor" select="1"/>
+ <xsl:with-param name="mode" select="'mono-ancestor'"/>
</xsl:call-template>
</xsl:template>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/fo/param.xsl
new/suse-xsl-stylesheets/xslt2013/fo/param.xsl
--- old/suse-xsl-stylesheets/xslt2013/fo/param.xsl 2013-12-03
19:01:53.000000000 +0100
+++ new/suse-xsl-stylesheets/xslt2013/fo/param.xsl 2014-03-10
11:47:56.000000000 +0100
@@ -356,4 +356,14 @@
<xsl:param name="titlepage.background.width"
><xsl:value-of select="(&column; * 5) + (&gutter; * 3)"/>mm</xsl:param>
+
+<!-- Characters for the hyphenation algorithm:
+ Contains characters hyhenated before or after other text
+-->
+<xsl:param name="ulink.hyphenate.before.chars"
+ >.,%?&#\~+{_-</xsl:param>
+<xsl:param name="ulink.hyphenate.after.chars"
+ >/:@=};</xsl:param>
+
+
</xsl:stylesheet>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/static/css/style.css
new/suse-xsl-stylesheets/xslt2013/static/css/style.css
--- old/suse-xsl-stylesheets/xslt2013/static/css/style.css 2013-12-18
14:30:44.000000000 +0100
+++ new/suse-xsl-stylesheets/xslt2013/static/css/style.css 2014-04-14
11:53:11.000000000 +0200
@@ -59,11 +59,7 @@
}
#_toolbar-bottom,
-#_fixed-header-wrap #_bubble-toc, #_content > .set, #_content > .book,
-#_content > .article, #_content > .part, #_content > .chapter, #_content >
.preface,
-#_content > .appendix, #_content > .glossary, #_content > .reference,
-#_content > .refentry, #_content > .bibliography, #_content > .index,
-.page-bottom {
+#_fixed-header-wrap #_bubble-toc, .documentation, .page-bottom {
margin: 0 auto;
min-width: 150px;
max-width: 978px;
@@ -83,11 +79,7 @@
padding-top: 40px;
}
-#_footer, #_toolbar-bottom, #_content > .set, #_content > .book,
-#_content > .article, #_content > .part, #_content > .chapter,
-#_content > .preface, #_content > .appendix, #_content > .glossary,
-#_content > .reference, #_content > .refentry, #_content > .bibliography,
-#_content > .index, #_content > .page-bottom {
+#_footer, #_toolbar-bottom, .documentation, .page-bottom {
overflow: hidden;
}
@@ -1173,17 +1165,14 @@
/* .CHAPTER/... AREA */
-#_content > .set, #_content > .book, #_content > .article, #_content > .part,
-#_content > .chapter, #_content > .preface, #_content > .appendix,
-#_content > .glossary, #_content > .reference, #_content > .refentry,
-#_content > .bibliography, #_content > .index {
+.documentation {
padding: 0 20px;
}
/* We need to scroll ~30 pixels up, such that the headline won't be hidden by
the fixed header. */
/* [attribute] selector works in IE 7+. Firefox, Opera and Webkit-based
browsers had it far earlier. */
-#_content a[id] {
+.documentation a[id] {
position: relative;
top: -33px;
display: block;
@@ -1191,7 +1180,7 @@
height: 0;
}
-#_content [id]:target > span, #_content .admonition[id]:target > h6 {
+.documentation [id]:target > span, .documentation .admonition[id]:target > h6 {
background-color: rgba(255,255,0,0.3);
transition: background-color 0.2s ease-out 0.3s;
/* Clean the below up in Q3 2013 or so... */
@@ -1224,7 +1213,7 @@
display: none;
}
-#_content .screen a[id] {
+.documentation .screen a[id] {
display: none;
}
@@ -1439,7 +1428,7 @@
line-height: 15px;
overflow: hidden;
padding: 0 3px;
- border-bottom: 1px solid #FFF;
+ border-bottom: 1px solid transparent;
background-color: #EEE;
text-transform: uppercase;
display: inline-block;
@@ -1565,7 +1554,7 @@
/* Text styles */
-#_content span, #_content a, #_content p, #_content em, #_content strong {
+.documentation span, .documentation a, .documentation p, .documentation em,
.documentation strong {
position: relative;
z-index: 2;
}
@@ -1913,7 +1902,6 @@
max-width: 100%;
min-height: 60px;
text-align: center;
- color: #999;
margin: 24px 0 -9px;
overflow: hidden;
position: relative;
@@ -1927,24 +1915,22 @@
text-align: center;
color: #999;
padding: 12px 10px;
- background-color: #333;
+ background-color: #FFF;
overflow: hidden;
- border-top: 1px solid #202020;
- border-left: 1px solid #202020;
- border-right: 1px solid #202020;
+ border: 1px solid #EFEFF0;
}
.figure img {
padding: 0;
- background-color: #FFF;
width: auto;
margin: 0 auto;
/* Please clean this mess out in ~2014 -- leave only the line with "calc"
in there */
+ min-width: 50px;
max-width: 100%;
max-width: calc(100% - 2px);
max-width: -moz-calc(100% - 2px);
max-width: -webkit-calc(100% - 2px);
- display: block; /* inline images weirdly have some whitespace below them,
thus block'ing */
+ display: block; /* inline images weirdly have some whitespace below them,
thus blocking */
}
.figure-title {
@@ -1954,28 +1940,19 @@
}
div.figure .figure-title-wrap {
- background-color: #202020;
+ background-color: #EFEFF0;
width: 100%;
overflow: hidden;
}
-div.figure .number, div.figure .permalink:hover, div.figure .permalink:focus,
div.figure .permalink:active {
- color: #76AD2D;
- text-decoration: none;
- font-weight: normal;
-}
-
-div.figure .name, div.figure .permalink {
- color: #FFF;
-}
-
.informalfigure img {
+ min-width: 50px;
max-width: 100%;
display: block; /* inline images weirdly have some whitespace below them,
thus block'ing */
color: #999;
margin: 17px 0 24px;
padding: 1px;
- border: 1px solid #202020;
+ border: 1px solid #EFEFF0;
width: auto;
}
@@ -2314,7 +2291,7 @@
padding: 10px;
}
-#_content > .doc-status {
+.documentation > .doc-status {
margin: 0 auto;
min-width: 380px;
max-width: 978px;
@@ -2342,6 +2319,36 @@
font-size: 22px;
}
+.hidden {
+ background-color: #E3C1C1;
+ position: static;
+ margin-top: 20px;
+ margin-left: -10px;
+ margin-right: -10px;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-bottom: 10px;
+}
+
+.hidden:before {
+ content: 'Hidden';
+ display: block;
+ float: left;
+ background-color: #8C0000;
+ color: #FFF;
+ padding: 3px 5px;
+ margin-top: 10px;
+}
+
+.hidden .hidden {
+ margin-top: 0;
+ padding-bottom: 0;
+}
+
+.hidden .hidden:before {
+ content: none;
+}
+
body.draft {
background: url(../images/draft.png) no-repeat fixed left 50%;
}
@@ -2363,10 +2370,7 @@
color: #202020;
}
- #_content > .set, #_content > .book, #_content > .article,
- #_content > .part, #_content > .chapter, #_content > .preface,
- #_content > .appendix, #_content > .glossary, #_content > .reference,
- #_content > .refentry, #_content > .bibliography, #_content > .index {
+ .documentation {
padding: 0;
}
@@ -2535,10 +2539,7 @@
padding: 0;
}
- #_footer, #_content > .set, #_content > .book, #_content > .article,
#_content > .part,
- #_content > .chapter, #_content > .preface, #_content > .appendix,
- #_content > .glossary, #_content > .reference, #_content > .refentry,
- #_content > .bibliography, #_content > .index {
+ #_footer, .documentation {
padding: 0 10px;
}
@@ -2871,7 +2872,7 @@
margin: 0 auto;
}
- #_content ul, #_content ol {
+ .documentation ul, .documentation ol {
padding-left: 10px;
}
@@ -2917,7 +2918,7 @@
max-width: -webkit-calc(100% + 20px);
max-width: calc(100% + 20px);
}
- #_content ol.procedure {
+ .documentation ol.procedure {
padding-left: 20px;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/xhtml/chunk-common.xsl
new/suse-xsl-stylesheets/xslt2013/xhtml/chunk-common.xsl
--- old/suse-xsl-stylesheets/xslt2013/xhtml/chunk-common.xsl 2013-10-16
11:54:03.000000000 +0200
+++ new/suse-xsl-stylesheets/xslt2013/xhtml/chunk-common.xsl 2014-03-13
14:16:42.000000000 +0100
@@ -614,9 +614,11 @@
<xsl:with-param name="node" select="'id-content'"/>
</xsl:call-template>
<xsl:call-template name="metadata"/>
+ <div class="documentation">
<xsl:copy-of select="$content"/>
+ </div>
<div class="page-bottom">
<xsl:call-template name="bottom.navigation">
<xsl:with-param name="prev" select="$prev"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/xhtml/docbook.xsl
new/suse-xsl-stylesheets/xslt2013/xhtml/docbook.xsl
--- old/suse-xsl-stylesheets/xslt2013/xhtml/docbook.xsl 2013-10-28
17:11:16.000000000 +0100
+++ new/suse-xsl-stylesheets/xslt2013/xhtml/docbook.xsl 2014-03-13
14:16:42.000000000 +0100
@@ -510,7 +510,7 @@
</xsl:template>
<xsl:template name="outerelement.class.attribute">
- <!-- To accommodate ActiveDoc's needs, we add this to both body and
+ <!-- To accommodate for ActiveDoc's needs, add this to both body and
#_content.-->
<xsl:param name="node" select="'body'"/>
@@ -579,9 +579,11 @@
<xsl:with-param name="node" select="'id-content'"/>
</xsl:call-template>
<xsl:call-template name="metadata"/>
+ <div class="documentation">
<xsl:apply-templates select="."/>
+ </div>
<div class="page-bottom">
<xsl:call-template name="share.and.print">
<xsl:with-param name="prev" select="$prev"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/xhtml/html.xsl
new/suse-xsl-stylesheets/xslt2013/xhtml/html.xsl
--- old/suse-xsl-stylesheets/xslt2013/xhtml/html.xsl 2012-11-07
13:47:52.000000000 +0100
+++ new/suse-xsl-stylesheets/xslt2013/xhtml/html.xsl 2014-03-26
19:16:38.000000000 +0100
@@ -36,4 +36,24 @@
</xsl:choose>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+
+ <!-- Adapted to support hidden value of OS - currently this value
+ is only used in the SUSE Manager documentation. -->
+ <xsl:template name="common.html.attributes">
+ <xsl:param name="inherit" select="0"/>
+ <xsl:param name="class">
+ <xsl:value-of select="local-name(.)"/>
+ <xsl:text> </xsl:text>
+ <xsl:if test="($draft.mode = 'yes' or $draft.mode = 'maybe')
+ and normalize-space(@os) = 'hidden'">
+ <xsl:value-of select="@os"/>
+ </xsl:if>
+ </xsl:param>
+
+ <xsl:apply-templates select="." mode="common.html.attributes">
+ <xsl:with-param name="class" select="$class"/>
+ <xsl:with-param name="inherit" select="$inherit"/>
+ </xsl:apply-templates>
+ </xsl:template>
+
+</xsl:stylesheet>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/xslt2013/xhtml/sections.xsl
new/suse-xsl-stylesheets/xslt2013/xhtml/sections.xsl
--- old/suse-xsl-stylesheets/xslt2013/xhtml/sections.xsl 2013-09-25
13:27:58.000000000 +0200
+++ new/suse-xsl-stylesheets/xslt2013/xhtml/sections.xsl 2014-03-20
15:59:22.000000000 +0100
@@ -229,10 +229,18 @@
<xsl:call-template name="create.permalink">
<xsl:with-param name="object" select="$section"/>
</xsl:call-template>
+ <xsl:call-template name="create.header.line">
+ <xsl:with-param name="object" select="$section"/>
+ </xsl:call-template>
</xsl:element>
<xsl:call-template name="debug.filename-id"/>
</xsl:template>
+<!-- Hook for additional customizations -->
+<xsl:template name="create.header.line">
+ <xsl:param name="object" select="."/>
+</xsl:template>
+
<xsl:template name="debug.filename-id">
<xsl:param name="node" select="."/>
<xsl:variable name="xmlbase"
@@ -245,7 +253,7 @@
self::sect1 or
self::sect2 or
self::sect3 or
- self::sect4]/@xml:base"/>
+ self::sect4][1]/@xml:base"/>
<xsl:if test="$draft.mode = 'yes' and $xmlbase != ''">
<div class="doc-status">
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
