Merge trunk r3881 into new_features branch

This commit is contained in:
Pierre Labastie 2016-12-03 18:31:32 +00:00
parent e042e91776
commit dc315ea7c8

View file

@ -247,7 +247,7 @@
<xsl:template match="para" mode="dependency"> <xsl:template match="para" mode="dependency">
<xsl:variable name="status" select="./@role"/> <xsl:variable name="status" select="./@role"/>
<!-- First internal dependencies --> <!-- First internal dependencies -->
<xsl:for-each select="./xref"> <xsl:for-each select=".//xref">
<xsl:choose> <xsl:choose>
<!-- Avoid depending of myself --> <!-- Avoid depending of myself -->
<xsl:when test="ancestor::*[@id=current()/@linkend]"/> <xsl:when test="ancestor::*[@id=current()/@linkend]"/>
@ -278,7 +278,7 @@
</xsl:choose> </xsl:choose>
</xsl:for-each> </xsl:for-each>
<!-- then external dependencies --> <!-- then external dependencies -->
<xsl:for-each select="./ulink"> <xsl:for-each select=".//ulink">
<xsl:text> <xsl:text>
</xsl:text> </xsl:text>
<xsl:element name="dependency"> <xsl:element name="dependency">