From: <ama...@us...> - 2013-06-16 01:27:27
|
Revision: 20439 http://sourceforge.net/p/pcgen/code/20439 Author: amaitland Date: 2013-06-16 01:27:25 +0000 (Sun, 16 Jun 2013) Log Message: ----------- updates Modified Paths: -------------- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_simple.xslt Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_simple.xslt =================================================================== --- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_simple.xslt 2013-06-16 00:46:09 UTC (rev 20438) +++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_simple.xslt 2013-06-16 01:27:25 UTC (rev 20439) @@ -5,12 +5,10 @@ <xsl:output indent="yes"/> - - <xsl:template match="melee"> <xsl:param name="column_width" select="'wide'" /> <xsl:choose> - <xsl:when test="w1_h1_p/to_hit='N/A' "> + <xsl:when test="w1_h1_p/to_hit = invalidtext/tohit"> <xsl:call-template name="simple_weapon"> <xsl:with-param name="to_hit" select="w1_h2/to_hit"/> <xsl:with-param name="damage" select="w1_h2/damage"/> Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt =================================================================== --- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt 2013-06-16 00:46:09 UTC (rev 20438) +++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt 2013-06-16 01:27:25 UTC (rev 20439) @@ -3872,7 +3872,7 @@ <fo:block font-size="6pt" font-weight="bold" space-before="1pt">Dam</fo:block> </fo:table-cell> </fo:table-row> - <xsl:if test="not(w1_h1_p/to_hit = 'N/A' and w1_h1_p/damage = 'N/A' and w2_p_oh/to_hit = 'N/A' and w2_p_oh/damage = 'N/A')"> + <xsl:if test="not(w1_h1_p/to_hit = invalidtext/tohit and w2_p_oh/to_hit = invalidtext/tohit)"> <fo:table-row keep-with-next.within-column="always"> <!-- 1HP, 2WP-OH --> <xsl:call-template name="weapon.complex.tohit"> @@ -3887,7 +3887,8 @@ </xsl:call-template> </fo:table-row> </xsl:if> - <xsl:if test="not(w1_h1_o/to_hit = 'N/A' and w1_h1_o/damage = 'N/A' and w2_p_ol/to_hit = 'N/A' and w2_p_ol/damage = 'N/A')"> +<!--> <xsl:if test="not(w1_h1_o/to_hit = 'invalidtext/tohit' and w1_h1_o/damage = 'invalidtext/damage' and w2_p_ol/to_hit = 'invalidtext/tohit' and w2_p_ol/damage = 'invalidtext/damage')"> --> + <xsl:if test="not(w1_h1_o/to_hit = invalidtext/tohit and w1_h1_o/damage = invalidtext/damage and w2_p_ol/to_hit = invalidtext/tohit and w2_p_ol/damage = invalidtext/damage)"> <fo:table-row keep-with-next.within-column="always"> <!-- 1HO, 2WPOL --> <xsl:call-template name="weapon.complex.tohit"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |