DeforaNetworks/pentext
DeforaNetworks/pentext
3
0
Fork 0
Code Releases Activity

Improvement to placeholder error info & readability

Browse Source
This commit is contained in:
skyanth 2017-06-23 08:55:43 +02:00
parent ee9de74f89
commit 580af35500
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xml/xslt/placeholders.xslt
View File

@ -518,10 +518,33 @@
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<fo:inline xsl:use-attribute-sets="errortext">[ Cannot resolve <xsl:value-of select="name()"/> - element "<xsl:value-of select="name($placeholderElement)"/>" empty or not found ]</fo:inline> <fo:inline xsl:use-attribute-sets="errortext">[ <fo:inline xsl:use-attribute-sets="bold">WARNING</fo:inline>: Cannot resolve placeholder <fo:inline xsl:use-attribute-sets="bold"><xsl:value-of select="name()"/></fo:inline> in <xsl:value-of select="base-uri()"/> - <xsl:call-template name="getReason"><xsl:with-param name="placeholderElement" select="$placeholderElement"/></xsl:call-template> ]</fo:inline>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
<xsl:template name="getReason">
<xsl:param name="placeholderElement" select="."/>
<xsl:choose>
<xsl:when test="/$placeholderElement">
element <fo:inline xsl:use-attribute-sets="bold">"<xsl:value-of select="name($placeholderElement)"/>"</fo:inline> (<xsl:call-template name="getXPath"><xsl:with-param name="element" select="$placeholderElement"/></xsl:call-template>) is empty
</xsl:when>
<xsl:otherwise>
referenced element not found
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="getXPath">
<xsl:param name="element" select="."/>
<xsl:for-each select="$element/ancestor-or-self::*">
<xsl:value-of select="concat('/',local-name())"/>
<!--Predicate is only output when needed.-->
<xsl:if test="(preceding-sibling::*|following-sibling::*)[local-name()=local-name(current())]">
<xsl:value-of select="concat('[',count(preceding-sibling::*[local-name()=local-name(current())])+1,']')"/>
</xsl:if>
</xsl:for-each>
</xsl:template>
<xsl:template name="generate_activities_xslt"> <xsl:template name="generate_activities_xslt">
<fo:list-block xsl:use-attribute-sets="list"> <fo:list-block xsl:use-attribute-sets="list">

3
xml/xslt/styles.xslt
View File

@ -47,9 +47,8 @@
<xsl:attribute name="font-weight">bold</xsl:attribute> <xsl:attribute name="font-weight">bold</xsl:attribute>
</xsl:attribute-set>--> </xsl:attribute-set>-->
<xsl:attribute-set name="errortext"> <xsl:attribute-set name="errortext">
<xsl:attribute name="color">red</xsl:attribute> <xsl:attribute name="color">orange</xsl:attribute>
<xsl:attribute name="background-color">black</xsl:attribute> <xsl:attribute name="background-color">black</xsl:attribute>
<xsl:attribute name="font-weight">bold</xsl:attribute>
</xsl:attribute-set> </xsl:attribute-set>
<xsl:attribute-set name="title-0" use-attribute-sets="title"> <xsl:attribute-set name="title-0" use-attribute-sets="title">
<xsl:attribute name="text-align">center</xsl:attribute> <xsl:attribute name="text-align">center</xsl:attribute>