PCGen :: An RPG Character Generator

Revision: 15006
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15006&view=rev
Author:   amaitland
Date:     2011-05-19 19:28:37 +0000 (Thu, 19 May 2011)

Log Message:
-----------
Added in the Checklist Block(s) - Altered location to try and prevent overflow; might have to go on second page
Issue#: OS-79


Issue#: OS-76

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2011-05-19 17:13:34 UTC (rev 15005)
+++ Trunk/pcgen/outputsheets/base.xml	2011-05-19 19:28:37 UTC (rev 15006)
@@ -1298,6 +1298,19 @@
 |ENDFOR|
 	</checklists>
 
+	<!-- Proficiency lists -->
+	<proficiency_specials>
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Special Ability","TYPE=ProficiencyOutputDisplay")-1,1,0|
+|IIF(ABILITYALL.Special Ability.%ability.TYPE=ProficiencyOutputDisplay)|
+		<proficiency>
+			<name>|ABILITYALL.Special Ability.%ability.TYPE=ProficiencyOutputDisplay|</name>
+			<proficient>|ABILITYALL.Special Ability.%ability.TYPE=ProficiencyOutputDisplay.ASPECT.Proficiency|</proficient>
+			<forte>|ABILITYALL.Special Ability.%ability.TYPE=ProficiencyOutputDisplay.ASPECT.Forte|</forte>
+		</proficiency>
+|ENDIF|
+|ENDFOR|
+</proficiency_specials>
+
 <!--
 	  ====================================
 	  ====================================

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-19 17:13:34 UTC (rev 15005)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-19 19:28:37 UTC (rev 15006)
@@ -298,6 +298,7 @@
 										</xsl:apply-templates>
 										<xsl:apply-templates select="class_features/eclipse_channeling"/>
 										<xsl:apply-templates select="class_features/channel_energy"/>
+										<xsl:apply-templates select="checklists"/>
 									</fo:table-cell>
 								</fo:table-row>
 								<fo:table-row>
@@ -321,7 +322,6 @@
 										<xsl:apply-templates select="class_features/wholeness_of_body"/>
 										<xsl:apply-templates select="class_features/layonhands"/>
 										<xsl:apply-templates select="class_features/psionics"/>
-										<xsl:apply-templates select="checklists"/>
 									</fo:table-cell>
 								</fo:table-row>
 							</fo:table-body>
@@ -400,6 +400,7 @@
 						<xsl:apply-templates select="feats"/>
 						<xsl:apply-templates select="domains"/>
 						<xsl:apply-templates select="weapon_proficiencies"/>
+						<xsl:apply-templates select="proficiency_specials"/>
 						<xsl:apply-templates select="templates"/>
 						<xsl:apply-templates select="prohibited_schools"/>
 						<xsl:apply-templates select="companions"/>
@@ -7220,4 +7221,5 @@
 		</xsl:if>
 		<!-- END CHARACTER NOTES Pages -->
 	</xsl:template>
+	<!-- End Character -->
 </xsl:stylesheet>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15035
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15035&view=rev
Author:   amaitland
Date:     2011-05-28 01:36:10 +0000 (Sat, 28 May 2011)

Log Message:
-----------
Set up alt natural attack block for finer control.

Issue#: OS-77

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2011-05-27 21:52:33 UTC (rev 15034)
+++ Trunk/pcgen/outputsheets/base.xml	2011-05-28 01:36:10 UTC (rev 15035)
@@ -640,6 +640,18 @@
 |ENDIF|
 <!-- End Spirit Weapon - Ranged -->
 
+	<!-- Natural Attack -->
+|IIF(ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.HASASPECT.NaturalAttackName:Y)|			
+	<naturalattack>	
+		<name>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackName|</name>
+		<tohit>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackToHit|</tohit>
+		<damage>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackDamage|</damage>
+		<damage_bonus>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackDamageBonus.INTVAL.SIGN|</damage_bonus>
+		<reach>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackReach.INTVAL|</reach>
+		<notes>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackNotes||ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.DESC|</notes>
+	</naturalattack>
+|ENDIF|
+
 |FOR,%weap,0,COUNT[EQTYPE.WEAPON]-1,1,1|
 |IIF(WEAPON.%weap.CATEGORY:BOTH)|
 

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-27 21:52:33 UTC (rev 15034)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-28 01:36:10 UTC (rev 15035)
@@ -307,6 +307,7 @@
 										<xsl:apply-templates select="attack" mode="ranged_melee"/>
 										<xsl:apply-templates select="weapons/martialarts"/>
 										<xsl:apply-templates select="weapons/unarmed"/>
+										<xsl:apply-templates select="weapons/naturalattack"/>
 										<xsl:apply-templates select="weapons/spiritweaponmelee"/>
 										<xsl:apply-templates select="weapons/spiritweaponranged"/>
 										<xsl:apply-templates select="weapons">
@@ -400,7 +401,7 @@
 						<xsl:apply-templates select="feats"/>
 						<xsl:apply-templates select="domains"/>
 						<xsl:apply-templates select="weapon_proficiencies"/>
-						<xsl:apply-templates select="proficiency_specials"/>
+<!-->						<xsl:apply-templates select="proficiency_specials"/>-->
 						<xsl:apply-templates select="templates"/>
 						<xsl:apply-templates select="prohibited_schools"/>
 						<xsl:apply-templates select="companions"/>
@@ -1507,15 +1508,15 @@
 		<fo:table table-layout="fixed" space-before="2pt">
 			<fo:table-column column-width="12mm"/>
 			<!-- TITLE -->
-			<fo:table-column column-width="2mm"/>
+			<fo:table-column column-width="1mm"/>
 			<!-- space -->
 			<fo:table-column column-width="8mm"/>
 			<!-- TOTAL AC -->
-			<fo:table-column column-width="2mm"/>
+			<fo:table-column column-width="1mm"/>
 			<!-- : -->
 			<fo:table-column column-width="8mm"/>
 			<!-- FLAT -->
-			<fo:table-column column-width="2mm"/>
+			<fo:table-column column-width="1mm"/>
 			<!-- : -->
 			<fo:table-column column-width="8mm"/>
 			<!-- TOUCH -->
@@ -1566,14 +1567,21 @@
 			<fo:table-column>
 				<xsl:attribute name="column-width"><xsl:value-of select="0.09 * (0.71 * $pagePrintableWidth - 69)" />mm</xsl:attribute>
 			</fo:table-column>
+			<!-- Dodge -->
+			<fo:table-column column-width="2mm"/>
+			<!-- + -->
+
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.08 * (0.71 * $pagePrintableWidth - 69)" />mm</xsl:attribute>
+			</fo:table-column>
 			<!-- misc   -->
-			<fo:table-column column-width="4mm"/>
+			<fo:table-column column-width="2mm"/>
 			<!-- space -->
 			<fo:table-column>
-				<xsl:attribute name="column-width"><xsl:value-of select="0.11 * (0.71 * $pagePrintableWidth - 69)" />mm</xsl:attribute>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.08 * (0.71 * $pagePrintableWidth - 69)" />mm</xsl:attribute>
 			</fo:table-column>
 			<!-- miss chance -->
-			<fo:table-column column-width="3mm"/>
+			<fo:table-column column-width="2mm"/>
 			<!-- space -->
 			<fo:table-column>
 				<xsl:attribute name="column-width"><xsl:value-of select="0.08 * (0.71 * $pagePrintableWidth - 69)" />mm</xsl:attribute>
@@ -1715,6 +1723,17 @@
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'ac'"/>
 						</xsl:call-template>
+						<fo:block font-size="10pt">
+							<xsl:value-of select="deflection"/>
+						</fo:block>
+					</fo:table-cell>
+					<fo:table-cell display-align="center">
+						<fo:block text-align="center" font-size="6pt">+</fo:block>
+					</fo:table-cell>
+					<fo:table-cell display-align="center">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'ac'"/>
+						</xsl:call-template>
 						<fo:block text-align="center" font-size="10pt">
 							<xsl:value-of select="misc"/>
 						</fo:block>
@@ -1801,6 +1820,10 @@
 					</fo:table-cell>
 					<fo:table-cell/>
 					<fo:table-cell>
+						<fo:block text-align="center" font-size="4pt">DODGE</fo:block>
+					</fo:table-cell>
+					<fo:table-cell/>
+					<fo:table-cell>
 						<fo:block text-align="center" font-size="4pt">MISC</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
@@ -3022,6 +3045,8 @@
 ====================================-->
 	<xsl:template match="weapons/unarmed">
 		<!-- START Unarmed Attack Table -->
+		<xsl:choose>
+		<xsl:when test="(weapons/naturalattack) &lt; 1">
 		<fo:table table-layout="fixed" space-before="2mm">
 			<fo:table-column column-width="27mm"/>
 			<fo:table-column>
@@ -3098,7 +3123,7 @@
 					</fo:table-cell>
 				</fo:table-row>
 				<fo:table-row>
-					<fo:table-cell>
+					<fo:table-cell >
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'weapon.title'"/>
 						</xsl:call-template>
@@ -3109,8 +3134,142 @@
 				</fo:table-row>
 			</fo:table-body>
 		</fo:table>
+		</xsl:when>
+		<xsl:otherwise/>
+		</xsl:choose>
+		
 		<!-- STOP Unarmed Attack Table -->
 	</xsl:template>
+
+
+		<!--
+====================================
+====================================
+	TEMPLATE - Natural Weapon ATTACK TABLE
+====================================
+====================================-->
+	<xsl:template match="weapons/naturalattack">
+		<!-- START Natural Attack Table -->
+
+		<fo:table table-layout="fixed" space-before="2mm" keep-with-next.within-column="always">
+			<fo:table-column column-width="27mm"/>
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * $pagePrintableWidth - 77" />mm</xsl:attribute>
+			</fo:table-column>
+			<fo:table-column column-width="16mm"/>
+			<fo:table-column column-width="16mm"/>
+			<fo:table-column column-width="16mm"/>
+			<fo:table-body>
+				<fo:table-row>
+					<fo:table-cell number-rows-spanned="2">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'weapon.title'"/>
+						</xsl:call-template>
+						<fo:block font-weight="bold" font-size="9pt">
+							<xsl:value-of select="name"/>
+						</fo:block>
+					</fo:table-cell>
+					<fo:table-cell>
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'weapon.title'"/>
+						</xsl:call-template>
+						<fo:block font-size="6pt">TOTAL ATTACK BONUS</fo:block>
+					</fo:table-cell>
+					<fo:table-cell>
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'weapon.title'"/>
+						</xsl:call-template>
+						<fo:block font-size="6pt">DAMAGE</fo:block>
+					</fo:table-cell>
+					<fo:table-cell>
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'weapon.title'"/>
+						</xsl:call-template>
+						<fo:block font-size="6pt">CRITICAL</fo:block>
+					</fo:table-cell>
+					<fo:table-cell>
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'weapon.title'"/>
+						</xsl:call-template>
+						<fo:block font-size="6pt">REACH</fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+<!-->	<xsl:for-each select="naturalattack">-->
+				<fo:table-row>
+					<fo:table-cell number-rows-spanned="2">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'weapon.hilight'"/>
+						</xsl:call-template>
+						<fo:block font-size="8pt">
+							<xsl:value-of select="tohit"/>
+						</fo:block>
+					</fo:table-cell>
+					<fo:table-cell number-rows-spanned="2">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'weapon.hilight'"/>
+						</xsl:call-template>
+						<fo:block font-size="8pt">
+							<xsl:value-of select="damage"/>
+						</fo:block>
+					</fo:table-cell>
+					<fo:table-cell number-rows-spanned="2">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'weapon.hilight'"/>
+						</xsl:call-template>
+						<fo:block font-size="8pt">
+							<xsl:value-of select="threat"/>
+						</fo:block>
+					</fo:table-cell>
+					<fo:table-cell number-rows-spanned="2">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'weapon.hilight'"/>
+						</xsl:call-template>
+						<fo:block font-size="8pt">
+							<xsl:value-of select="reach"/>
+						</fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+				<fo:table-row>
+					<fo:table-cell>
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'weapon.title'"/>
+						</xsl:call-template>
+						<fo:block font-size="5pt">
+							<xsl:value-of select="type"/>
+						</fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+			<xsl:choose>
+				<xsl:when test="string-length(notes) &gt; 1">
+				<fo:table-row>
+					<fo:table-cell number-columns-spanned="1">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'weapon.title'"/>
+						</xsl:call-template>
+						<fo:block font-size="8pt" font-weight="bold">
+							<xsl:text>Special Properties:</xsl:text>
+						</fo:block>
+					</fo:table-cell>
+					<fo:table-cell number-columns-spanned="4">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'weapon.border'"/>
+						</xsl:call-template>
+						<fo:block font-size="8pt" padding-right="2pt">
+							<fo:inline> </fo:inline><xsl:value-of select="notes"/>
+						</fo:block>
+					</fo:table-cell>
+
+				</fo:table-row>
+				</xsl:when>
+				<xsl:otherwise/>
+			</xsl:choose>
+			<!-->	</xsl:for-each>-->
+
+			</fo:table-body>
+		</fo:table>
+		<!-- STOP Spirit Weapon Melee Attack Table -->
+	</xsl:template>
+
 	<!--
 ====================================
 ====================================
@@ -3141,7 +3300,7 @@
 			</xsl:if>
 		</xsl:for-each>
 		<xsl:if test="position() &gt;= $first_weapon">
-			<fo:block font-size="5pt" space-before="1pt" color="black">
+			<fo:block font-size="5pt" space-before="2mm" color="black">
 				<fo:inline font-weight="bold">*</fo:inline>: weapon is equipped
 			</fo:block>
 			<fo:block font-size="5pt" space-before="1pt" color="black">
@@ -4502,7 +4661,7 @@
 				</fo:table-row>
 			</fo:table-body>
 		</fo:table>
-<!-- 		|%| -->
+|%|
 		<!-- END Checklists table -->
 	</xsl:for-each>
 	</xsl:template>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15651
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15651&view=rev
Author:   amaitland
Date:     2011-12-13 03:16:40 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Ultimate Magic - Bomb Support

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2011-12-13 01:31:33 UTC (rev 15650)
+++ Trunk/pcgen/outputsheets/base.xml	2011-12-13 03:16:40 UTC (rev 15651)
@@ -642,12 +642,16 @@
 
 	<!-- Natural Attack -->
 |FOR,%NaturalAttack,0,count("ABILITIES","CATEGORY=Natural Attack","TYPE=NaturalAttack")-1,1,0|
-	<naturalattack>	
+	<naturalattack>	critmult
 		<name>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackName|</name>
 		<tohit>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackToHit.SIGN|</tohit>
 		<damage>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackDamage||ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackDamageBonus.SIGN|</damage>
+		<type>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackType|</type>
+		<threat>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackThreatRange||ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackCritMult|</threat>
 		<reach>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackReach.INTVAL|</reach>
 		<notes>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackNotes||ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.DESC|</notes>
+<!--> Used to Validate Word Toggle between Crit / Mult vs. Crit <-->
+		<critmult>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackCritMult|</critmult>
 	</naturalattack>
 |ENDFOR|
 

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-12-13 01:31:33 UTC (rev 15650)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-12-13 03:16:40 UTC (rev 15651)
@@ -2103,7 +2103,7 @@
 							<fo:block text-align="left" space-before.optimum="4pt" line-height="4pt" font-size="5pt">
 								<xsl:text>TOTAL SKILLPOINTS: </xsl:text>
 								<xsl:choose>
-								<xsl:when test="skillpoints/eclipse_total &gt; 0">
+								<xsl:when test="skillpoints/eclipse_total &gt; 0">	
 									<xsl:value-of select="skillpoints/eclipse_total"/>
 								</xsl:when>
 								<xsl:otherwise>
@@ -3185,7 +3185,14 @@
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'weapon.title'"/>
 						</xsl:call-template>
+				<xsl:choose>
+					<xsl:when test="critmult &gt; 0">
+						<fo:block font-size="6pt">CRIT / MULT</fo:block>
+					</xsl:when>
+					<xsl:otherwise>
 						<fo:block font-size="6pt">CRITICAL</fo:block>
+					</xsl:otherwise>
+				</xsl:choose>
 					</fo:table-cell>
 					<fo:table-cell>
 						<xsl:call-template name="attrib">
@@ -5214,6 +5221,24 @@
 						</fo:block>
 					</fo:table-cell>
 				</fo:table-row>
+			<!-->	<xsl:if test="count(companion/trick) &gt; 0">	-->
+					<fo:table-row keep-with-next.within-column="always">
+						<fo:table-cell text-align="end">
+							<xsl:call-template name="attrib">
+								<xsl:with-param name="attribute" select="'companions.title'"/>
+							</xsl:call-template>
+							<fo:block font-size="8pt">Tricks:</fo:block>
+						</fo:table-cell>
+						<fo:table-cell number-columns-spanned="5">
+							<xsl:call-template name="attrib">
+								<xsl:with-param name="attribute" select="'companions'"/>
+							</xsl:call-template>
+							<fo:block font-size="7pt">
+								<xsl:value-of select="trick"/>
+							</fo:block>
+						</fo:table-cell>
+					</fo:table-row>
+		<!-->		</xsl:if> -->
 			</fo:table-body>
 		</fo:table>
 	</xsl:template>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15868
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15868&view=rev
Author:   amaitland
Date:     2012-01-22 09:48:09 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
Update for Eclipse Channeling

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-01-22 06:00:24 UTC (rev 15867)
+++ Trunk/pcgen/outputsheets/base.xml	2012-01-22 09:48:09 UTC (rev 15868)
@@ -614,13 +614,13 @@
 <!-- Spirit Weapon - Melee -->
 |IIF(VAR.UseSpiritWeaponMelee:1)|
 		<spiritweaponmelee>
-			<total>|VAR.SpiritWeaponMeleeToHit.INTVAL|</total>
+			<total>+|VAR.SpiritWeaponMeleeToHit.INTVAL|</total>
 |IIF(VAR.SpiritWeaponMeleeBonusDamage&lt;0)|
 			<damage>|VAR.SpiritWeaponMeleeDie.INTVAL|d|VAR.SpiritWeaponMeleeDieSize.INTVAL|-|VAR.SpiritWeaponMeleeBonusDamage.INTVAL|</damage>
 |ELSE|
 			<damage>|VAR.SpiritWeaponMeleeDie.INTVAL|d|VAR.SpiritWeaponMeleeDieSize.INTVAL|+|VAR.SpiritWeaponMeleeBonusDamage.INTVAL|</damage>
 |ENDIF|
-			<critical>|VAR.SpiritWeaponMeleeCrit.INTVAL|/x|VAR.SpiritWeaponMeleeMult.INTVAL|</critical>
+			<critical>|VAR.SpiritWeaponMeleeCritRange.INTVAL|/x|VAR.SpiritWeaponMeleeCritMult.INTVAL|</critical>
 			<reach>|REACH|</reach>
 		</spiritweaponmelee>
 |ENDIF|
@@ -1181,11 +1181,13 @@
 		<level>|ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingLevel.INTVAL|</level>
 		<channeling_check>1d20|ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingCheck.INTVAL.SIGN|</channeling_check>
 		<intensity>1d20|ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingIntensity.INTVAL.SIGN|</intensity>
-		<damage>|ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingMagnitude|</damage>
+		<channel_intensity>|ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingIntensity.INTVAL|</channel_intensity>
+		<damage>|ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingMagnitude||ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingMagnitudeBonus.SIGN||ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingMagnitudeFactor|</damage>
 		<damage_bonus>|ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingMagnitudeBonus|</damage_bonus>
 		<uses_per_day>|ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingUses.INTVAL|</uses_per_day>
 		<range>|ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingRange.INTVAL|</range>
 		<notes>|ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingNotes|</notes>
+		<factor>|ABILITYALL.Special Ability.%eclipsecount.TYPE=ChannelingOutput.ASPECT.ChannelingMagnitudeFactor|</factor>
 	</eclipse_channeling>
 |ENDIF|
 |ENDFOR|

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-01-22 06:00:24 UTC (rev 15867)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-01-22 09:48:09 UTC (rev 15868)
@@ -2849,8 +2849,8 @@
 	TEMPLATE - Spirit Weapon Melee ATTACK TABLE
 ====================================
 ====================================-->
-	<xsl:template match="weapons/spiritweaponranged">
-		<!-- START Martial Arts Attack Table -->
+	<xsl:template match="weapons/spiritweaponmelee">
+		<!-- START Spirit Weapon Melee Attack Table -->
 		<fo:table table-layout="fixed" space-before="2mm">
 			<fo:table-column column-width="27mm"/>
 			<fo:table-column>
@@ -4065,7 +4065,8 @@
 	<xsl:template name="eclipse_channeling.info">
 		<xsl:param name="title"/>
 		<xsl:param name="info"/>
-
+		<xsl:param name="info2"/>
+		<xsl:param name="info3"/>
 		<fo:table-row>
 			<fo:table-cell padding-top="1pt" text-align="end">
 				<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'turning.title'"/></xsl:call-template>
@@ -4089,6 +4090,10 @@
 ====================================-->
 	<xsl:template match="eclipse_channeling">
 		<xsl:param name="column_width" select="0.45 * $pagePrintableWidth"/>
+		<xsl:variable name="channel_intensity">
+			<xsl:value-of select="/channel_intensity"/>
+		</xsl:variable>
+	<!--/character/eclipse_channeling	../character/eclipse_channeling/channel_intensity/>	-->
 		<!-- BEGIN Turning Table -->
 		<fo:table table-layout="fixed" space-before="1mm" keep-together="always"  border-collapse="collapse" padding="0.5pt">
 			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'turning'"/></xsl:call-template>
@@ -4165,43 +4170,44 @@
 								<fo:table-row height="1pt"/>
 								<xsl:call-template name="eclipse_channeling.intensity">
 									<xsl:with-param name="die" select="'Up to 0'"/>
-									<xsl:with-param name="number" select="number(level)-8" />
+									<xsl:with-param name="number" select="number(channel_intensity)-8"/>
+									
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.intensity">
 									<xsl:with-param name="die" select="'1 - 3'"/>
-									<xsl:with-param name="number" select="number(level)-7" />
+									<xsl:with-param name="number" select="number(channel_intensity)-7" />
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.intensity">
 									<xsl:with-param name="die" select="'4 - 6'"/>
-									<xsl:with-param name="number" select="number(level)-6" />
+									<xsl:with-param name="number" select="(channel_intensity)-6" />
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.intensity">
 									<xsl:with-param name="die" select="'7 - 9'"/>
-									<xsl:with-param name="number" select="number(level)-5" />
+									<xsl:with-param name="number" select="number(channel_intensity)-5" />
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.intensity">
 									<xsl:with-param name="die" select="'10 - 12'"/>
-									<xsl:with-param name="number" select="number(level)-4" />
+									<xsl:with-param name="number" select="number(channel_intensity)-4" />
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.intensity">
 									<xsl:with-param name="die" select="'13 - 15'"/>
-									<xsl:with-param name="number" select="number(level)-3" />
+									<xsl:with-param name="number" select="number(channel_intensity)-3" />
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.intensity">
 									<xsl:with-param name="die" select="'16 - 18'"/>
-									<xsl:with-param name="number" select="number(level)-2" />
+									<xsl:with-param name="number" select="number(channel_intensity)-2" />
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.intensity">
 									<xsl:with-param name="die" select="'19 - 21'"/>
-									<xsl:with-param name="number" select="number(level)-1" />
+									<xsl:with-param name="number" select="number(channel_intensity)-1" />
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.intensity">
 									<xsl:with-param name="die" select="'22 - 25'"/>
-									<xsl:with-param name="number" select="level" />
+									<xsl:with-param name="number" select="channel_intensity" />
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.intensity">
 									<xsl:with-param name="die" select="'26+'"/>
-									<xsl:with-param name="number" select="number(level)+1" />
+									<xsl:with-param name="number" select="number(channel_intensity)+1" />
 								</xsl:call-template>
 							</fo:table-body>
 						</fo:table>
@@ -4222,15 +4228,8 @@
 								<xsl:call-template name="eclipse_channeling.info">
 									<xsl:with-param name="title" select="'Magnitude'"/>
 									<xsl:with-param name="info" select="damage" />
-<!-- Need to get the CHOOSE to properly display>										<xsl:choose>
-											<xsl:when test="contains(type, 'MagnitudeTimes')">
-											<xsl:text>x</xsl:text>
-											</xsl:when>
-											<xsl:otherwise>
-											<xsl:text>+</xsl:text>
-											</xsl:otherwise>
-										</xsl:choose>-->
-									<xsl:with-param name="info" select="damage_bonus" />
+									<xsl:with-param name="info2" select="damage_bonus" />
+									<xsl:with-param name="info3" select="factor" />
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.info">
 									<xsl:with-param name="title" select="'Range'"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15939
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15939&view=rev
Author:   amaitland
Date:     2012-01-30 06:07:59 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
a few improvements and a CR inclusion.

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-01-30 06:04:31 UTC (rev 15938)
+++ Trunk/pcgen/outputsheets/base.xml	2012-01-30 06:07:59 UTC (rev 15939)
@@ -181,6 +181,7 @@
 			<all>|VISION|</all>
 		</vision>
 		<wealth>|VAR.WEALTH.INTVAL|</wealth>
+		<gold>|GOLD|</gold>
 		<weight>
 			<weight_unit>|WEIGHT|</weight_unit>
 			<weight_nounit>|WEIGHT.NOUNIT|</weight_nounit>
@@ -644,7 +645,7 @@
 |FOR,%NaturalAttack,0,count("ABILITIES","CATEGORY=Natural Attack","TYPE=NaturalAttack")-1,1,0|
 	<naturalattack>	critmult
 		<name>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackName|</name>
-		<tohit>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackToHit.SIGN|</tohit>
+		<tohit>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackToHit|</tohit>
 		<damage>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackDamage||ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackDamageBonus.SIGN|</damage>
 		<type>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackType|</type>
 		<threat>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackThreatRange||ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackCritMult|</threat>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-01-30 06:04:31 UTC (rev 15938)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-01-30 06:07:59 UTC (rev 15939)
@@ -737,6 +737,7 @@
 							<xsl:value-of select="classes/levels_total"/>
 							<xsl:if test="classes/levels_total != classes/levels_ecl">/<xsl:value-of select="classes/levels_ecl"/>
 							</xsl:if>
+							/ CR=<xsl:value-of select="cr"/>
 						</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
@@ -807,6 +808,7 @@
 							<xsl:if test="classes/levels_total != classes/levels_ecl">
 								<xsl:text>/ECL</xsl:text>
 							</xsl:if>
+							<xsl:text> / CR</xsl:text>
 						</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16143
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16143&view=rev
Author:   amaitland
Date:     2012-02-11 08:13:26 +0000 (Sat, 11 Feb 2012)
Log Message:
-----------
OS Improvements - Fix missing version; add CR to footer

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-02-11 08:06:31 UTC (rev 16142)
+++ Trunk/pcgen/outputsheets/base.xml	2012-02-11 08:13:26 UTC (rev 16143)
@@ -3275,9 +3275,9 @@
 |ENDFOR|
 			</spellbook>
 |%|
+|ENDFOR|				
 |ENDFOR|
 |ENDFOR|
-|ENDFOR|
 		</class_innate>
 		</spells_innate>
 |ENDIF|

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-02-11 08:06:31 UTC (rev 16142)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-02-11 08:13:26 UTC (rev 16143)
@@ -217,12 +217,12 @@
 			<fo:table-body>
 				<fo:table-row keep-with-next="always" keep-together="always">
 					<fo:table-cell text-align="start"  wrap-option="no-wrap" border-top-color="black" border-top-style="solid" border-top-width="0.1pt" background-color="transparent" padding-top="2pt">
-						<fo:block font-size="5pt" font-weight="bold">Character: <xsl:value-of select="/character/basics/name"/> [Level: <xsl:value-of select="/character/basics/classes/levels_total"/>]</fo:block>
+						<fo:block font-size="5pt" font-weight="bold">Character: <xsl:value-of select="/character/basics/name"/> [Level:<xsl:value-of select="/character/basics/classes/levels_total"/> / CR:<xsl:value-of select="/character/basics/cr"/>]</fo:block>
 						<fo:block font-size="5pt" font-weight="bold">Player: <xsl:value-of select="/character/basics/playername"/></fo:block>
 					</fo:table-cell>
 					<fo:table-cell text-align="center" wrap-option="no-wrap" border-top-color="black" border-top-style="solid" border-top-width="0.1pt" background-color="transparent" padding-top="2pt">
 						<fo:block text-align="center" font-size="5pt">PCGen Character Template by Frugal, based on work by ROG, Arcady, Barak, Dimrill &amp; Dekker.</fo:block>
-						<fo:block text-align="center" font-size="5pt">Created using PCGen <xsl:value-of select="export/version"/> on <xsl:value-of select="/character/export/date"/><xsl:text> at </xsl:text><xsl:value-of select="/character/export/time"/></fo:block>
+						<fo:block text-align="center" font-size="5pt">Created using PCGen <xsl:value-of select="/character/export/version"/> on <xsl:value-of select="/character/export/date"/><xsl:text> at </xsl:text><xsl:value-of select="/character/export/time"/></fo:block>
 					</fo:table-cell>
 					<fo:table-cell text-align="end" border-top-color="black" border-top-style="solid" border-top-width="0.1pt" background-color="transparent" padding-top="2pt">
 						<fo:block font-size="7pt">Page <fo:page-number/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16197
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16197&view=rev
Author:   amaitland
Date:     2012-02-14 03:18:12 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Rank should not be decimal on HTML Output Sheets - OS Folder
Issue#: OS-164

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm
    Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_modern_std.htm
    Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm
    Trunk/pcgen/outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm
    Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetSidewinder.htm
    Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm

Modified: Trunk/pcgen/outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm
===================================================================
--- Trunk/pcgen/outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm	2012-02-13 21:06:50 UTC (rev 16196)
+++ Trunk/pcgen/outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm	2012-02-14 03:18:12 UTC (rev 16197)
@@ -1138,7 +1138,7 @@
 		 <td align="center" class="sign">=</td>
 		 <td align="center" class="skillValue">|SKILL.%skill.ABMOD|<br /></td>
 		 <td align="center" class="sign">+</td>
-		 <td align="center" class="skillValue" >|SKILL.%skill.RANK|<br /></td>
+		 <td align="center" class="skillValue" >|TEXT.REPLACEFIRST{\.0,}.SKILL.%skill.RANK| <br /></td>
 		 <td align="center" class="sign">+</td>
 		 <td align="center" class="skillValue">|SKILL.%skill.MISC|<br /></td>
     </tr>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm	2012-02-13 21:06:50 UTC (rev 16196)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm	2012-02-14 03:18:12 UTC (rev 16197)
@@ -378,7 +378,7 @@
 ATKArr[2] = new ATK("Grapple","|ATTACK.GRAPPLE.TOTAL|","|ATTACK.GRAPPLE|",STRindex,|ATTACK.GRAPPLE.SIZE|,|ATTACK.GRAPPLE.EPIC|,|ATTACK.GRAPPLE.MISC|);
 // Now, set up the list of skills
 |FOR,%skill,0,COUNT[SKILLS]-1,1,1|
-SkillArr[%skill] = new Skill("|SKILL.%skill|","|SKILL.%skill.ABILITY|",|SKILL.%skill.TOTAL|,|SKILL.%skill.ABMOD|,|SKILL.%skill.RANK|,|SKILL.%skill.MISC|,"|SKILL.%skill.UNTRAINED|");
+SkillArr[%skill] = new Skill("|SKILL.%skill|","|SKILL.%skill.ABILITY|",|SKILL.%skill.TOTAL|,|SKILL.%skill.ABMOD|,|TEXT.REPLACEFIRST{\.0,}.SKILL.%skill.RANK| ,|SKILL.%skill.MISC|,"|SKILL.%skill.UNTRAINED|");
 |ENDFOR|
 // A variable of type Ability supports the following
 // Only those marked with * should be modified after creation

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm	2012-02-13 21:06:50 UTC (rev 16196)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm	2012-02-14 03:18:12 UTC (rev 16197)
@@ -938,7 +938,7 @@
 |ENDIF|
 // Now, set up the list of skills
 |FOR,%skill,0,COUNT[SKILLS]-1,1,1|
-SkillArr[%skill] = new Skill("|SKILL.%skill|","|SKILL.%skill.ABILITY|",|SKILL.%skill.TOTAL|,|SKILL.%skill.ABMOD|,|SKILL.%skill.RANK|,|SKILL.%skill.MISC|,"|SKILL.%skill.UNTRAINED|","|SKILL.%skill.EXPLAIN|");
+SkillArr[%skill] = new Skill("|SKILL.%skill|","|SKILL.%skill.ABILITY|",|SKILL.%skill.TOTAL|,|SKILL.%skill.ABMOD|,|TEXT.REPLACEFIRST{\.0,}.SKILL.%skill.RANK| ,|SKILL.%skill.MISC|,"|SKILL.%skill.UNTRAINED|","|SKILL.%skill.EXPLAIN|");
 |ENDFOR|
 // A variable of type Ability supports the following
 // Only those marked with * should be modified after creation

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm	2012-02-13 21:06:50 UTC (rev 16196)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm	2012-02-14 03:18:12 UTC (rev 16197)
@@ -417,7 +417,7 @@
      <td align="center" valign="bottom" class="font8"><b>=</b></td>
      <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.ABMOD|<br /></td>
      <td align="center" valign="bottom" class="font8"><b>+</b></td>
-     <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.RANK|<br /></td>
+     <td align="center" class="borderbottom8" valign="bottom">|TEXT.REPLACEFIRST{\.0,}.SKILL.%skill.RANK| <br /></td>
      <td align="center" valign="bottom" class="font8"><b>+</b></td>
      <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.MISC|<br /></td>
     </tr>

Modified: Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_modern_std.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_modern_std.htm	2012-02-13 21:06:50 UTC (rev 16196)
+++ Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_modern_std.htm	2012-02-14 03:18:12 UTC (rev 16197)
@@ -365,7 +365,7 @@
      <td align="center" valign="bottom" class="font8"><b>=</b></td>
      <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.ABMOD|<br /></td>
      <td align="center" valign="bottom" class="font8"><b>+</b></td>
-     <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.RANK|<br /></td>
+     <td align="center" class="borderbottom8" valign="bottom">|TEXT.REPLACEFIRST{\.0,}.SKILL.%skill.RANK| <br /></td>
      <td align="center" valign="bottom" class="font8"><b>+</b></td>
      <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.MISC|<br /></td>
     </tr>

Modified: Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm	2012-02-13 21:06:50 UTC (rev 16196)
+++ Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm	2012-02-14 03:18:12 UTC (rev 16197)
@@ -850,7 +850,7 @@
      <td align="center" valign="bottom" class="font8"><b>=</b></td>
      <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.ABMOD|<br /></td>
      <td align="center" valign="bottom" class="font8"><b>+</b></td>
-     <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.RANK|<br /></td>
+     <td align="center" class="borderbottom8" valign="bottom">|TEXT.REPLACEFIRST{\.0,}.SKILL.%skill.RANK| <br /></td>
      <td align="center" valign="bottom" class="font8"><b>+</b></td>
      <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.MISC|<br /></td>
     </tr>
@@ -989,9 +989,9 @@
 				<tr><td valign="top"><font face="Arial" style="font-size: 7pt">Feint</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Half</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Make a Bluff check opposed by your opponents Sense Motive; if you succeed, your target may not add his dexterity modifier to Defense whenyou attack him next.</font></td></tr>
 				<tr bgcolor="#DDDDDD"><td valign="top"><font face="Arial" style="font-size: 7pt">Grapple</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Half</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Special (see Spycraft Espionage Handbook, page 172).</font></td></tr>
 				<tr><td valign="top"><font face="Arial" style="font-size: 7pt">Refresh</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Full</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">If you are the target of no attacks this round, you may spend one action die at the end of the round to recover the result in vitality points, or 2 wounds.</font></td></tr>
-				<tr bgcolor="#DDDDDD"><td valign="top"><font face="Arial" style="font-size: 7pt">Strafe attack</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Half</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Target a number of adjacent squares up to half the ammo in your firearm and make an attack with a \x962 penalty per square beyond the first; all targets hit suffers the same damage; uses 2 shots per targeted square.</font></td></tr>
+				<tr bgcolor="#DDDDDD"><td valign="top"><font face="Arial" style="font-size: 7pt">Strafe attack</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Half</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Target a number of adjacent squares up to half the ammo in your firearm and make an attack with a 2 penalty per square beyond the first; all targets hit suffers the same damage; uses 2 shots per targeted square.</font></td></tr>
 				<tr><td valign="top"><font face="Arial" style="font-size: 7pt">Strafe object</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Half</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Special (see Spycraft Espionage Handbook, page 168).</font></td></tr>
-				<tr bgcolor="#DDDDDD"><td valign="top"><font face="Arial" style="font-size: 7pt">Supressive fire</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Full</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">One target within your line of sight suffers a \x964 penalty to attack and skill rolls for 1 round; uses 5 shots.</font></td></tr>
+				<tr bgcolor="#DDDDDD"><td valign="top"><font face="Arial" style="font-size: 7pt">Supressive fire</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Full</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">One target within your line of sight suffers a 4 penalty to attack and skill rolls for 1 round; uses 5 shots.</font></td></tr>
 				<tr><td valign="top"><font face="Arial" style="font-size: 7pt">Taunt</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Half</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Make a Bluff check opposed by your target's Sense Motive; if you succeed, your target must attack you with his next action.</font></td></tr>
 				<tr bgcolor="#DDDDDD"><td valign="top"><font face="Arial" style="font-size: 7pt">Trip</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Half</font></td><td valign="top"><font face="Arial" style="font-size: 7pt">Make a melee touch attack; if you hit, make a Strength check opposed by Strength or Dexterity; if you succeed, your target is prone.</font></td></tr>
 				<tr><td ><font face="Arial" style="font-size: 7pt"><b>MOVEMENT ACTIONS</b></font></td><td width="10%"><font face="Arial" style="font-size: 7pt"><b>TYPE</b></font></td><td width="30%"><font face="Arial" style="font-size: 7pt"><b>EFFECT</b></font></td></tr>

Modified: Trunk/pcgen/outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm	2012-02-13 21:06:50 UTC (rev 16196)
+++ Trunk/pcgen/outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm	2012-02-14 03:18:12 UTC (rev 16197)
@@ -290,7 +290,7 @@
      <td align="center" valign="bottom" class="font8"><b>=</b></td>
      <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.ABMOD|<br /></td>
      <td align="center" valign="bottom" class="font8"><b>+</b></td>
-     <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.RANK|<br /></td>
+     <td align="center" class="borderbottom8" valign="bottom">|TEXT.REPLACEFIRST{\.0,}.SKILL.%skill.RANK| <br /></td>
      <td align="center" valign="bottom" class="font8"><b>+</b></td>
      <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.MISC|<br /></td>
     </tr>

Modified: Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetSidewinder.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetSidewinder.htm	2012-02-13 21:06:50 UTC (rev 16196)
+++ Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetSidewinder.htm	2012-02-14 03:18:12 UTC (rev 16197)
@@ -314,7 +314,7 @@
      <td align="center" valign="bottom" class="font8"><b>=</b></td>
      <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.ABMOD|<br /></td>
      <td align="center" valign="bottom" class="font8"><b>+</b></td>
-     <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.RANK|<br /></td>
+     <td align="center" class="borderbottom8" valign="bottom">|TEXT.REPLACEFIRST{\.0,}.SKILL.%skill.RANK| <br /></td>
      <td align="center" valign="bottom" class="font8"><b>+</b></td>
      <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.MISC|<br /></td>
     </tr>

Modified: Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm
===================================================================
--- Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm	2012-02-13 21:06:50 UTC (rev 16196)
+++ Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm	2012-02-14 03:18:12 UTC (rev 16197)
@@ -409,7 +409,7 @@
      <td align="center" valign="bottom" class="font8"><b>=</b></td>
      <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.ABMOD|<br /></td>
      <td align="center" valign="bottom" class="font8"><b>+</b></td>
-     <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.RANK|<br /></td>
+     <td align="center" class="borderbottom8" valign="bottom">|TEXT.REPLACEFIRST{\.0,}.SKILL.%skill.RANK| <br /></td>
      <td align="center" valign="bottom" class="font8"><b>+</b></td>
      <td align="center" class="borderbottom8" valign="bottom">|SKILL.%skill.MISC|<br /></td>
     </tr>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16369
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16369&view=rev
Author:   amaitland
Date:     2012-03-01 17:59:56 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
Implement new Portrait Thumb view for Preview and OS files
Issue#: OS-167

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-03-01 16:37:41 UTC (rev 16368)
+++ Trunk/pcgen/outputsheets/base.xml	2012-03-01 17:59:56 UTC (rev 16369)
@@ -159,11 +159,11 @@
 			<trait>|PERSONALITY1|</trait>
 			<trait>|PERSONALITY2|</trait>
 		</personality>
-		<portrait>|PORTRAIT|</portrait>
-<!-->	<portrait>
+<!-->		<portrait>|PORTRAIT|</portrait>-->
+		<portrait>
 			<portrait>|PORTRAIT|</portrait>
-			<portait_thumb>|PORTRAIT.THUMB|</portrait_thumb>
-		</portrait>	-->
+			<portrait_thumb>|PORTRAIT.THUMB|</portrait_thumb>
+		</portrait>	
 		<phobias>|PHOBIAS|</phobias>
 		<race>|RACE|</race>
 		<reach>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-01 16:37:41 UTC (rev 16368)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-01 17:59:56 UTC (rev 16369)
@@ -549,20 +549,20 @@
 							<xsl:value-of select="alignment/long"/>
 						</fo:block>
 					</fo:table-cell>
-					<xsl:if test="string-length(portrait) &gt; 0">
+			<!-->		<xsl:if test="string-length(portrait) &gt; 0">	-->
 						<fo:table-cell/>
 						<fo:table-cell number-rows-spanned="6">
 							<xsl:call-template name="attrib">
 								<xsl:with-param name="attribute" select="'picture'"/>
 							</xsl:call-template>
 							<fo:block>
-								<xsl:variable name="portrait_file" select="portrait"/>
+								<xsl:variable name="portrait_file" select="/character/basics/portrait/portrait_thumb"/>
 								<fo:external-graphic src="file:{$portrait_file}">
 									<xsl:attribute name="column-width"><xsl:value-of select="($pagePrintableWidth - 14) div 8" />mm</xsl:attribute>
 								</fo:external-graphic>
 							</fo:block>
 						</fo:table-cell>
-					</xsl:if>
+			<!-->		</xsl:if>	-->
 				</fo:table-row>
 				<fo:table-row>
 					<fo:table-cell number-columns-spanned="3">
@@ -4243,8 +4243,6 @@
 								<xsl:call-template name="eclipse_channeling.info">
 									<xsl:with-param name="title" select="'Magnitude'"/>
 									<xsl:with-param name="info" select="damage" />
-									<xsl:with-param name="info2" select="damage_bonus" />
-									<xsl:with-param name="info3" select="factor" />
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.info">
 									<xsl:with-param name="title" select="'Range'"/>
@@ -4913,7 +4911,7 @@
 ====================================-->
 	<xsl:template match="domains">
 		<!-- BEGIN Domains Table -->
-		<xsl:call-template name="stripped.list">
+		<xsl:call-template name="bold.list">
 			<xsl:with-param name="attribute" select="'domains'" />
 			<xsl:with-param name="title" select="'DOMAINS'" />
 			<xsl:with-param name="list" select="domain"/>
@@ -6885,7 +6883,7 @@
 					<xsl:value-of select="school/fullschool"/>
 				</fo:block>
 			</fo:table-cell>	<!-->
-			<fo:table-cell padding-top="1pt">
+			<fo:table-cell padding-top="1pt" number-columns-spanned="2">
 				<fo:block text-align="start" font-size="5pt">
 					<xsl:value-of select="source/sourceshort"/>
 					<xsl:text>: </xsl:text>
@@ -6926,7 +6924,7 @@
 			</fo:table-cell>
 			<fo:table-cell padding-top="1pt" number-columns-spanned="1">
 				<fo:block text-align="start" font-size="5pt">
-					<fo:inline font-style="italic">Caster Level: </fo:inline>
+					<fo:inline font-style="italic">Caster Level:</fo:inline>
 					<xsl:value-of select="casterlevel"/>
 				</fo:block>
 			</fo:table-cell>
@@ -6934,7 +6932,7 @@
 			<fo:table-cell padding-top="1pt" number-columns-spanned="2">
 				<fo:block text-align="start" font-size="5pt">
 					<xsl:if test="concentration != ''">
-						<fo:inline font-style="italic">Concentration: </fo:inline>
+						<fo:inline font-style="italic">Concentration:</fo:inline>
 						<xsl:value-of select="concentration"/>
 					</xsl:if>
 				</fo:block>
@@ -7229,8 +7227,8 @@
 ====================================
 ====================================-->
 	<xsl:template match="basics" mode="bio">
-		<!-- BEGIN BIO Pages -->
-		<xsl:if test="string-length(translate(normalize-space(concat(description,bio)), ' ', '')) &gt; 0">
+		<!-- BEGIN BIO Pages 
+		<xsl:if test="string-length(translate(normalize-space(concat(description,bio)), ' ', '')) &gt; 0"> -->
 			<fo:page-sequence>
 				<xsl:attribute name="master-reference">Portrait</xsl:attribute>
 				<xsl:call-template name="page.footer"/>
@@ -7269,7 +7267,7 @@
 												<xsl:with-param name="attribute" select="'picture'"/>
 											</xsl:call-template>
 											<fo:block start-indent="1mm" height="100mm">
-												<xsl:variable name="portrait_file" select="portrait"/>
+												<xsl:variable name="portrait_file" select="portrait/portrait"/>
 												<fo:external-graphic src="file:{$portrait_file}" width="92mm" scaling="uniform"/>
 											</fo:block>
 										</fo:table-cell>
@@ -7350,7 +7348,7 @@
 									<xsl:with-param name="value" select="interests"/>
 								</xsl:call-template>
 								<xsl:call-template name="bio.entry">
-									<xsl:with-param name="title" select="'SPOKEN STYLE'"/>
+									<xsl:with-param name="title" select="'SPOKEN STYLE / CATCH PHRASE'"/>
 									<xsl:with-param name="value" select="concat(speechtendency, ', ', catchphrase)"/>
 								</xsl:call-template>
 								<xsl:call-template name="bio.entry">
@@ -7386,7 +7384,7 @@
 					</fo:block>
 				</fo:flow>
 			</fo:page-sequence>
-		</xsl:if>
+		<!--></xsl:if>-->
 		<!-- END BIO Pages -->
 	</xsl:template>
 	<!--

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16592
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16592&view=rev
Author:   amaitland
Date:     2012-03-23 18:44:40 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Set Up Ranged Weapons to have full range increments displayed on the character sheet. - PDF
Issue#: OS-174

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-03-22 12:11:57 UTC (rev 16591)
+++ Trunk/pcgen/outputsheets/base.xml	2012-03-23 18:44:40 UTC (rev 16592)
@@ -660,19 +660,28 @@
 
 	<!-- Natural Attack -->
 |FOR,%NaturalAttack,0,count("ABILITIES","CATEGORY=Natural Attack","TYPE=NaturalAttack")-1,1,0|
-	<naturalattack>	critmult
+	<naturalattack>
 		<name>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackName|</name>
 		<tohit>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackToHit|</tohit>
 		<damage>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackDamage|</damage>
 		<type>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackType|</type>
 		<threat>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackThreatRange||ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackCritMult|</threat>
 		<reach>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackReach.INTVAL|</reach>
-		<range>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackRange.INTVAL|</range>
+				<range>|ABILITYALL.Natural Attack.%NaturalAttack.%NaturalAttackRange.TYPE=NaturalAttack.ASPECT.NaturalAttackRange|</range>
+		<rangeincrement>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackRangeIncrement|</rangeincrement>
 
+|FOR,%NaturalAttackRange,0,4,1,0|
+		<range>
+		<distance>|ABILITYALL.Natural Attack.%NaturalAttackRange.TYPE=NaturalAttack.ASPECT.NaturalAttackRange|</distance>
+		<rangeincrement>|ABILITYALL.Natural Attack.%NaturalAttackRange.TYPE=NaturalAttack.ASPECT.NaturalAttackRangeIncrement|</rangeincrement>
+		<distance_unit>|UNITSET.DISTANCEUNIT|</distance_unit>
+		</range>
+|ENDFOR|
 		<notes>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackNotes||ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.DESC|</notes>
 <!--> Used to Validate Word Toggle between Crit / Mult vs. Crit <-->
 		<critmult>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackCritMult|</critmult>
 		<!--|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackDamageBonus.SIGN|-->
+		<distance_unit>|UNITSET.DISTANCEUNIT|</distance_unit>
 	</naturalattack>
 |ENDFOR|
 
@@ -767,7 +776,8 @@
 				</w2_o>
 			</melee>
 |ENDIF| <!-- IIF(WEAPON.%weap.CATEGORY:Ranged) -->
-|IIF(WEAPON.%weap.CATEGORY:Ranged)|
+|IIF(WEAPON.%weap.CATEGORY:Ranged)|	<!-- We work out now whether this is a Ranged Only or Thrown -->
+|IIF(WEAPON.%weap.ISTYPE.Thrown)| <!-- Valid only if we find the Thrown Value -->
 			<ranges>
 |FOR,%range,0,4,1,0|
 				<range>
@@ -783,16 +793,36 @@
 				</range>
 |ENDFOR|	<!-- Range -->
 			</ranges>
-		</weapon>
+|ELSE| <!-- IIF(WEAPON.%weap.ISTYPE.Thrown) but IS Ranged -->
+
+<!-- New Ranges Section -->
+			<ranges>
+|FOR,%range,0,9,1,0|
+				<range>
+					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
+					<to_hit>|WEAPON.%weap.RANGELIST.%range.TOTALHIT|</to_hit>
+					<damage>|WEAPON.%weap.RANGELIST.%range.DAMAGE|</damage>
+					<basehit>|WEAPON.%weap.RANGELIST.%range.BASEHIT|</basehit>
+					<tohit_offhand>|WEAPON.%weap.RANGELIST.%range.OHHIT|</tohit_offhand>
+					<tohit_twohand>|WEAPON.%weap.RANGELIST.%range.BASEHIT|</tohit_twohand>
+					<tohit_2weap_heavy>|WEAPON.%weap.RANGELIST.%range.TWPHITH|</tohit_2weap_heavy>
+					<tohit_2weap_light>|WEAPON.%weap.RANGELIST.%range.TWPHITL|</tohit_2weap_light>
+					<tohit_2weap_offhand>|WEAPON.%weap.RANGELIST.%range.TWOHIT|</tohit_2weap_offhand>
+				</range>
+|ENDFOR|	<!-- Range -->
+			</ranges>
+		
+|ENDIF| <!-- IIF(WEAPON.%weap.ISTYPE.Thrown) -->
+</weapon>
 |ELSE| <!-- IIF(WEAPON.%weap.CATEGORY:Ranged) -->
 |ENDIF| <!-- IIF(WEAPON.%weap.CATEGORY:Ranged) -->
 
 
+<!-- End New Ranges Section -->
 |ELSE| <!-- IIF(WEAPON.%weap.CATEGORY:BOTH) -->
 
 
 |IIF(WEAPON.%weap.CATEGORY:Ranged)|
-
 		<weapon>
 			<common>
 				<name>
@@ -847,6 +877,7 @@
 			</common>
 |IIF(WEAPON.%weap.CONTENTS:0)|
 			<ranges>
+|IIF(WEAPON.%weap.ISTYPE.Thrown)|
 |FOR,%range,0,4,1,0|
 				<range>
 					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
@@ -860,7 +891,23 @@
 					<tohit_2weap_offhand>|WEAPON.%weap.RANGELIST.%range.TWOHIT|</tohit_2weap_offhand>
 				</range>
 |ENDFOR|	<!-- Range -->
+|ELSE|	<!--|IIF(WEAPON.%weap.ISTYPE.Thrown)| -->
+
+|FOR,%range,0,9,1,0|
+				<range>
+					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
+					<to_hit>|WEAPON.%weap.RANGELIST.%range.TOTALHIT|</to_hit>
+					<damage>|WEAPON.%weap.RANGELIST.%range.DAMAGE|</damage>
+					<basehit>|WEAPON.%weap.RANGELIST.%range.BASEHIT|</basehit>
+					<tohit_offhand>|WEAPON.%weap.RANGELIST.%range.OHHIT|</tohit_offhand>
+					<tohit_twohand>|WEAPON.%weap.RANGELIST.%range.BASEHIT|</tohit_twohand>
+					<tohit_2weap_heavy>|WEAPON.%weap.RANGELIST.%range.TWPHITH|</tohit_2weap_heavy>
+					<tohit_2weap_light>|WEAPON.%weap.RANGELIST.%range.TWPHITL|</tohit_2weap_light>
+					<tohit_2weap_offhand>|WEAPON.%weap.RANGELIST.%range.TWOHIT|</tohit_2weap_offhand>
+				</range>
+|ENDFOR|	<!-- Range -->
 			</ranges>
+|ENDIF|	<!--|IIF(WEAPON.%weap.ISTYPE.Thrown)| -->
 |ELSE|   <!-- IIF(WEAPON.%weap.CONTENTS:0) -->
 |FOR,%ammo,0,WEAPON.%weap.CONTENTS-1,1,0|
 			<ranges>
@@ -869,6 +916,7 @@
 					<special_properties>|WEAPON.%weap.CONTENTS.%ammo.SPROP|</special_properties>
 					<quantity>|EQ.IS.WEAPON.%weap.CONTENTS.%ammo.QTY|</quantity>
 				</ammunition>
+|IIF(WEAPON.%weap.ISTYPE.Thrown)|
 |FOR,%range,0,4,1,0|
 				<range>
 					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
@@ -882,6 +930,25 @@
 					<tohit_2weap_offhand>|WEAPON.%weap.RANGELIST.%range.TWOHIT|</tohit_2weap_offhand>
 				</range>
 |ENDFOR|	<!-- Range -->
+|ELSE|	<!--|IIF(WEAPON.%weap.ISTYPE.Thrown)| -->
+
+
+|FOR,%range,0,9,1,0|
+				<range>
+					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
+					<to_hit>|WEAPON.%weap.RANGELIST.%range.CONTENTS.%ammo.TOTALHIT|</to_hit>
+					<damage>|WEAPON.%weap.RANGELIST.%range.CONTENTS.%ammo.DAMAGE|</damage>
+					<basehit>|WEAPON.%weap.RANGELIST.%range.BASEHIT|</basehit>
+					<tohit_offhand>|WEAPON.%weap.RANGELIST.%range.OHHIT|</tohit_offhand>
+					<tohit_twohand>|WEAPON.%weap.RANGELIST.%range.BASEHIT|</tohit_twohand>
+					<tohit_2weap_heavy>|WEAPON.%weap.RANGELIST.%range.TWPHITH|</tohit_2weap_heavy>
+					<tohit_2weap_light>|WEAPON.%weap.RANGELIST.%range.TWPHITL|</tohit_2weap_light>
+					<tohit_2weap_offhand>|WEAPON.%weap.RANGELIST.%range.TWOHIT|</tohit_2weap_offhand>
+				</range>
+|ENDFOR|	<!-- Range -->
+
+|ENDIF|	<!--|IIF(WEAPON.%weap.ISTYPE.Thrown)| -->
+
 			</ranges>
 |ENDFOR|  <!-- FOR,%ammo,0,WEAPON.%weap.CONTENTS-1,1,1 -->
 |ENDIF|   <!-- IIF(WEAPON.%weap.CONTENTS:0) -->

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-22 12:11:57 UTC (rev 16591)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-23 18:44:40 UTC (rev 16592)
@@ -424,7 +424,7 @@
 		<fo:table table-layout="fixed">
 			<xsl:attribute name="width"><xsl:value-of select="$pagePrintableWidth" />mm</xsl:attribute>
 			<xsl:choose>
-				<xsl:when test="string-length(portrait) &gt; 0">
+				<xsl:when test="string-length(portrait/portrait) &gt; 0">
 					<fo:table-column>
 						<xsl:attribute name="column-width"><xsl:value-of select="($pagePrintableWidth - 14) div 8" />mm</xsl:attribute>
 					</fo:table-column>
@@ -549,7 +549,7 @@
 							<xsl:value-of select="alignment/long"/>
 						</fo:block>
 					</fo:table-cell>
-			<!-->		<xsl:if test="string-length(portrait) &gt; 0">	-->
+					<xsl:if test="string-length(portrait/portrait) &gt; 0">	
 						<fo:table-cell/>
 						<fo:table-cell number-rows-spanned="6">
 							<xsl:call-template name="attrib">
@@ -562,7 +562,7 @@
 								</fo:external-graphic>
 							</fo:block>
 						</fo:table-cell>
-			<!-->		</xsl:if>	-->
+					</xsl:if>	
 				</fo:table-row>
 				<fo:table-row>
 					<fo:table-cell number-columns-spanned="3">
@@ -3153,7 +3153,6 @@
 ====================================-->
 	<xsl:template match="weapons/naturalattack">
 		<!-- START Natural Attack Table -->
-
 		<fo:table table-layout="fixed" space-before="2mm" keep-with-next.within-column="always">
 			<fo:table-column column-width="27mm"/>
 			<fo:table-column>
@@ -3189,7 +3188,7 @@
 							<xsl:with-param name="attribute" select="'weapon.title'"/>
 						</xsl:call-template>
 				<xsl:choose>
-					<xsl:when test="critmult &gt; 0">
+					<xsl:when test="string-length(critmult) &gt; 0">
 						<fo:block font-size="6pt">CRIT / MULT</fo:block>
 					</xsl:when>
 					<xsl:otherwise>
@@ -3201,7 +3200,14 @@
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'weapon.title'"/>
 						</xsl:call-template>
+				<xsl:choose>
+					<xsl:when test="range &gt; 0">
+						<fo:block font-size="6pt">RANGE</fo:block>
+					</xsl:when>
+					<xsl:otherwise>
 						<fo:block font-size="6pt">REACH</fo:block>
+					</xsl:otherwise>
+				</xsl:choose>
 					</fo:table-cell>
 				</fo:table-row>
 <!-->	<xsl:for-each select="naturalattack">-->
@@ -3235,10 +3241,20 @@
 							<xsl:with-param name="attribute" select="'weapon.hilight'"/>
 						</xsl:call-template>
 						<fo:block font-size="8pt">
-							<xsl:value-of select="reach"/>
+						<xsl:choose>
+							<xsl:when test="range &gt; 0">
+								<xsl:value-of select="range"/>
+								<xsl:value-of select="distance_unit"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:value-of select="reach"/>
+								<xsl:value-of select="distance_unit"/>
+							</xsl:otherwise>
+						</xsl:choose>
 						</fo:block>
 					</fo:table-cell>
 				</fo:table-row>
+<!-- New Row -->
 				<fo:table-row>
 					<fo:table-cell>
 						<xsl:call-template name="attrib">
@@ -3251,35 +3267,198 @@
 				</fo:table-row>
 			<xsl:choose>
 				<xsl:when test="string-length(notes) &gt; 1">
-				<fo:table-row>
-					<fo:table-cell number-columns-spanned="1">
-						<xsl:call-template name="attrib">
-							<xsl:with-param name="attribute" select="'weapon.title'"/>
-						</xsl:call-template>
-						<fo:block font-size="8pt" font-weight="bold">
-							<xsl:text>Special Properties:</xsl:text>
-						</fo:block>
-					</fo:table-cell>
-					<fo:table-cell number-columns-spanned="4">
-						<xsl:call-template name="attrib">
-							<xsl:with-param name="attribute" select="'weapon.border'"/>
-						</xsl:call-template>
-						<fo:block font-size="8pt" padding-right="2pt">
-							<fo:inline> </fo:inline><xsl:value-of select="notes"/>
-						</fo:block>
-					</fo:table-cell>
-
-				</fo:table-row>
+					<fo:table-row>
+						<fo:table-cell number-columns-spanned="1">
+							<xsl:call-template name="attrib">
+								<xsl:with-param name="attribute" select="'weapon.title'"/>
+							</xsl:call-template>
+							<fo:block font-size="8pt" font-weight="bold">
+								<xsl:text>Special Properties:</xsl:text>
+							</fo:block>
+						</fo:table-cell>
+						<fo:table-cell number-columns-spanned="4">
+							<xsl:call-template name="attrib">
+								<xsl:with-param name="attribute" select="'weapon.border'"/>
+							</xsl:call-template>
+							<fo:block font-size="8pt" padding-right="2pt">
+								<fo:inline> </fo:inline><xsl:value-of select="notes"/>
+							</fo:block>
+						</fo:table-cell>
+					</fo:table-row>
 				</xsl:when>
 				<xsl:otherwise/>
 			</xsl:choose>
 			<!-->	</xsl:for-each>-->
-
-			</fo:table-body>
-		</fo:table>
-		<!-- STOP Spirit Weapon Melee Attack Table -->
+			<fo:table-row>
+			</fo:table-row>
+		</fo:table-body>
+	</fo:table>
+<!-- New Table For Spacing -->
+<xsl:choose>
+	<xsl:when test="range &gt; 0">
+			<!-- First Row for Thrown Weapons - Increment of 5 + Short range <xsl:for-each select="rangeincrement">		</xsl:for-each>-->
+		<xsl:call-template name="range.distance.thrown">
+			<xsl:with-param name="distance" select="range"/>
+			<xsl:with-param name="tohit" select="tohit"/>
+			<xsl:with-param name="damage" select="damage"/>
+		</xsl:call-template>
+	</xsl:when>
+	<xsl:otherwise/>
+</xsl:choose>
+		<!-- STOP Natural Attack Table -->
 	</xsl:template>
 
+	<xsl:template name="range.distance.thrown">
+		<xsl:param name="distance"/>
+		<xsl:param name="tohit"/>
+		<xsl:param name="damage"/>
+			<fo:table table-layout="fixed" space-before="2mm" keep-with-next.within-column="always">
+			<fo:table-column column-width="16mm"/>
+			<fo:table-column column-width="16mm"/>
+			<fo:table-column column-width="16mm"/>
+			<fo:table-column column-width="16mm"/>
+			<fo:table-column column-width="16mm"/>
+			<fo:table-column column-width="16mm"/>
+			<fo:table-body>
+				<fo:table-row>
+<!-->HEREIAM-->				<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.title'"/>
+							</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									Range
+								</fo:block>
+							</fo:table-cell>
+						<xsl:for-each select="range">
+							<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.border'"/>
+							</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									<xsl:value-of select="number($distance)"/>
+									<xsl:value-of select="distance_unit"/> / 
+									<xsl:value-of select="$tohit"/>
+								</fo:block>
+							</fo:table-cell>
+						</xsl:for-each>
+							<!-- 2nd -->
+<!-->							<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.border'"/>
+							</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									<xsl:value-of select="range*2"/>
+									<xsl:value-of select="distance_unit"/>
+								</fo:block>
+							</fo:table-cell>
+							<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.border'"/>
+							</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									<xsl:value-of select="range*3"/>
+									<xsl:value-of select="distance_unit"/>
+								</fo:block>
+							</fo:table-cell>
+							<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.border'"/>
+							</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									<xsl:value-of select="range*4"/>
+									<xsl:value-of select="distance_unit"/>
+								</fo:block>
+							</fo:table-cell>
+							<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.border'"/>
+							</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									<xsl:value-of select="range*5"/>
+									<xsl:value-of select="distance_unit"/>
+								</fo:block>
+							</fo:table-cell>-->
+						</fo:table-row>	
+						<fo:table-row>
+								<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.title'"/>
+							</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									To Hit
+								</fo:block>
+							</fo:table-cell>
+							<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.border'"/>
+							</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									<xsl:value-of select="tohit"/>
+								</fo:block>
+							</fo:table-cell>
+							<!-- 2nd -->
+							<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.border'"/>
+							</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									<xsl:value-of select="tohit"/>
+									
+								</fo:block>
+							</fo:table-cell>
+							<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.border'"/>
+							</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									<xsl:value-of select="tohit"/>
+								</fo:block>
+							</fo:table-cell>
+							<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.border'"/>
+							</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									<xsl:value-of select="range*4"/>
+									<xsl:value-of select="distance_unit"/>
+								</fo:block>
+							</fo:table-cell>
+							<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.border'"/>
+							</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									<xsl:value-of select="range*5"/>
+									<xsl:value-of select="distance_unit"/>
+								</fo:block>
+							</fo:table-cell>
+							</fo:table-row>
+						</fo:table-body>
+						</fo:table>
+						</xsl:template>
+
+						<xsl:template name="range.ranged">
+							<fo:table-cell number-columns-spanned="1">
+								<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.border'"/>
+								</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									<xsl:value-of select="range*6"/>
+									<xsl:value-of select="distance_unit"/>
+								</fo:block>
+							</fo:table-cell>
+						
+						
+							<fo:table-cell number-columns-spanned="1">
+								<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'weapon.border'"/>
+								</xsl:call-template>
+								<fo:block font-size="8pt" padding-right="2pt">
+									<xsl:value-of select="range*7"/>
+									<xsl:value-of select="distance_unit"/>
+								</fo:block>
+							</fo:table-cell>
+						</xsl:template>
 	<!--
 ====================================
 ====================================
@@ -3390,7 +3569,7 @@
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'weapon.title'"/>
 						</xsl:call-template>
-						<fo:block font-size="6pt">REACH</fo:block>
+							<fo:block font-size="6pt">REACH</fo:block>
 					</fo:table-cell>
 				</fo:table-row>
 				<fo:table-row keep-with-next.within-column="always">
@@ -3443,8 +3622,15 @@
 							<xsl:with-param name="attribute" select="'weapon'"/>
 						</xsl:call-template>
 						<fo:block font-size="7pt">
+						<xsl:choose>
+						<xsl:when test="string-length(range/distance) &gt; 1">
+							<xsl:value-of select="range"/> 
+						</xsl:when>
+						<xsl:otherwise>
 							<xsl:value-of select="reach"/> 
 							<xsl:value-of select="reachunit"/>
+						</xsl:otherwise>
+						</xsl:choose>
 						</fo:block>
 					</fo:table-cell>
 				</fo:table-row>
@@ -3759,7 +3945,7 @@
 					<fo:table-cell>
 						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
 					</fo:table-cell>
-					<xsl:for-each select="range">
+					<xsl:for-each select="range[position() &lt; 6]">
 						<fo:table-cell>
 							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
 							<fo:block font-size="5pt" font-weight="bold">
@@ -3774,7 +3960,7 @@
 						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
 						<fo:block font-size="6pt" font-weight="bold">TH</fo:block>
 					</fo:table-cell>
-					<xsl:for-each select="range">
+					<xsl:for-each select="range[position() &lt; 6]">
 						<fo:table-cell>
 							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.hilight'"/></xsl:call-template>
 							<fo:block space-before="1pt">
@@ -3795,7 +3981,7 @@
 						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
 						<fo:block font-size="6pt" font-weight="bold">Dam</fo:block>
 					</fo:table-cell>
-					<xsl:for-each select="range">
+					<xsl:for-each select="range[position() &lt; 6]">
 						<fo:table-cell>
 							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.hilight'"/></xsl:call-template>
 							<fo:block font-size="7pt" space-before="1pt">
@@ -3804,6 +3990,62 @@
 						</fo:table-cell>
 					</xsl:for-each>
 				</fo:table-row>
+
+<!-- New Row For Actual Range with 10 increments -->
+			<xsl:choose>
+			<xsl:when test="range[position() &gt; 5]">	-->
+				<fo:table-row keep-with-next.within-column="always">
+					<!-- Distances -->
+					<fo:table-cell>
+						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
+					</fo:table-cell>
+					<xsl:for-each select="range[position() &gt; 5 and position() &lt; 11]">
+						<fo:table-cell>
+							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
+							<fo:block font-size="5pt" font-weight="bold">
+								<xsl:value-of select="distance"/>
+							</fo:block>
+						</fo:table-cell>
+					</xsl:for-each>
+				</fo:table-row>
+				<fo:table-row keep-with-next.within-column="always">
+					<!-- Range To-Hits -->
+					<fo:table-cell>
+						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
+						<fo:block font-size="6pt" font-weight="bold">TH</fo:block>
+					</fo:table-cell>
+					<xsl:for-each select="range[position() &gt; 5 and position() &lt; 11]">
+						<fo:table-cell>
+							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.hilight'"/></xsl:call-template>
+							<fo:block space-before="1pt">
+								<xsl:attribute name="font-size">
+									<xsl:choose>
+										<xsl:when test="string-length(to_hit) &gt; 15">6pt</xsl:when>
+										<xsl:otherwise>7pt</xsl:otherwise>
+									</xsl:choose>
+								</xsl:attribute>
+								<xsl:value-of select="to_hit"/>
+							</fo:block>
+						</fo:table-cell>
+					</xsl:for-each>
+				</fo:table-row>
+				<fo:table-row keep-with-next.within-column="always">
+					<!-- Damages -->
+					<fo:table-cell>
+						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
+						<fo:block font-size="6pt" font-weight="bold">Dam</fo:block>
+					</fo:table-cell>
+					<xsl:for-each select="range[position() &gt; 5 and position() &lt; 11]">
+						<fo:table-cell>
+							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.hilight'"/></xsl:call-template>
+							<fo:block font-size="7pt" space-before="1pt">
+								<xsl:value-of select="damage"/>
+							</fo:block>
+						</fo:table-cell>
+					</xsl:for-each>
+				</fo:table-row>
+				</xsl:when>
+				</xsl:choose>
 			</fo:table-body>
 		</fo:table>
 	</xsl:template>
@@ -4186,7 +4428,6 @@
 								<xsl:call-template name="eclipse_channeling.intensity">
 									<xsl:with-param name="die" select="'Up to 0'"/>
 									<xsl:with-param name="number" select="number(channel_intensity)-8"/>
-									
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.intensity">
 									<xsl:with-param name="die" select="'1 - 3'"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16625
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16625&view=rev
Author:   amaitland
Date:     2012-03-28 00:57:11 +0000 (Wed, 28 Mar 2012)
Log Message:
-----------
Set Up Ranged Weapons to have full range increments displayed on the character sheet. - PDF [Thrown weapons still need work]
Issue#: OS-174

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-03-27 22:06:52 UTC (rev 16624)
+++ Trunk/pcgen/outputsheets/base.xml	2012-03-28 00:57:11 UTC (rev 16625)
@@ -779,6 +779,7 @@
 |IIF(WEAPON.%weap.CATEGORY:Ranged)|	<!-- We work out now whether this is a Ranged Only or Thrown -->
 |IIF(WEAPON.%weap.ISTYPE.Thrown)| <!-- Valid only if we find the Thrown Value -->
 			<ranges>
+				<rangetype>Thrown</rangetype>
 |FOR,%range,0,4,1,0|
 				<range>
 					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
@@ -797,7 +798,8 @@
 
 <!-- New Ranges Section -->
 			<ranges>
-|FOR,%range,0,9,1,0|
+			<rangetype>Ranged</rangetype>
+|FOR,%range,0,10,1,0|
 				<range>
 					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
 					<to_hit>|WEAPON.%weap.RANGELIST.%range.TOTALHIT|</to_hit>
@@ -878,6 +880,8 @@
 |IIF(WEAPON.%weap.CONTENTS:0)|
 			<ranges>
 |IIF(WEAPON.%weap.ISTYPE.Thrown)|
+			
+				<rangetype>Thrown</rangetype>
 |FOR,%range,0,4,1,0|
 				<range>
 					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
@@ -892,8 +896,8 @@
 				</range>
 |ENDFOR|	<!-- Range -->
 |ELSE|	<!--|IIF(WEAPON.%weap.ISTYPE.Thrown)| -->
-
-|FOR,%range,0,9,1,0|
+				<rangetype>Ranged</rangetype>
+|FOR,%range,0,10,1,0|
 				<range>
 					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
 					<to_hit>|WEAPON.%weap.RANGELIST.%range.TOTALHIT|</to_hit>
@@ -917,6 +921,7 @@
 					<quantity>|EQ.IS.WEAPON.%weap.CONTENTS.%ammo.QTY|</quantity>
 				</ammunition>
 |IIF(WEAPON.%weap.ISTYPE.Thrown)|
+				<rangetype>Thrown</rangetype>
 |FOR,%range,0,4,1,0|
 				<range>
 					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
@@ -931,9 +936,9 @@
 				</range>
 |ENDFOR|	<!-- Range -->
 |ELSE|	<!--|IIF(WEAPON.%weap.ISTYPE.Thrown)| -->
+				<rangetype>Ranged</rangetype>
 
-
-|FOR,%range,0,9,1,0|
+|FOR,%range,0,10,1,0|
 				<range>
 					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
 					<to_hit>|WEAPON.%weap.RANGELIST.%range.CONTENTS.%ammo.TOTALHIT|</to_hit>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-27 22:06:52 UTC (rev 16624)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-28 00:57:11 UTC (rev 16625)
@@ -3957,11 +3957,103 @@
 						</fo:table-cell>
 					</fo:table-row>
 				</xsl:if>
+				<xsl:if test="range[position() &gt; 5 or ../../common/range &gt; 10]">	
+	<!-->			<xsl:if test="count(./ranges/range) = 6 or count(./ranges/range) = 11">-->
+					<fo:table-row keep-with-next.within-column="always">
+						<xsl:for-each select="range[position() &lt; 2]">	
+							<fo:table-cell number-columns-spanned="2">
+							<xsl:call-template name="attrib">
+								<xsl:with-param name="attribute" select="'weapon.title'"/>
+							</xsl:call-template>
+							<fo:block font-size="7pt" font-weight="bold">
+							Range: <xsl:value-of select="distance"/>
+							</fo:block>
+							</fo:table-cell>
+							<fo:table-cell number-columns-spanned="2">
+							<xsl:call-template name="attrib">
+								<xsl:with-param name="attribute" select="'weapon.title'"/>
+							</xsl:call-template>
+							<fo:block font-size="7pt" font-weight="bold">
+							To Hit: <xsl:value-of select="to_hit"/> 
+							</fo:block>
+							</fo:table-cell>
+							<fo:table-cell number-columns-spanned="2">
+							<xsl:call-template name="attrib">
+								<xsl:with-param name="attribute" select="'weapon.title'"/>
+							</xsl:call-template>
+							<fo:block font-size="7pt" font-weight="bold">
+							Damage: <xsl:value-of select="damage"/>
+							</fo:block>
+							</fo:table-cell>
+						</xsl:for-each>	
+					</fo:table-row>
+				</xsl:if>
+
+			<xsl:if test="range[position() &gt; 6]">
 				<fo:table-row keep-with-next.within-column="always">
 					<!-- Distances -->
 					<fo:table-cell>
 						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
 					</fo:table-cell>
+					<xsl:for-each select="range[position() &gt; 1 and position() &lt; 8]">
+						<fo:table-cell>
+							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
+							<fo:block font-size="5pt" font-weight="bold">
+								<xsl:value-of select="distance"/>
+							</fo:block>
+						</fo:table-cell>
+					</xsl:for-each>
+				</fo:table-row>
+				<fo:table-row keep-with-next.within-column="always">
+					<!-- Range To-Hits -->
+					<fo:table-cell>
+						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
+						<fo:block font-size="6pt" font-weight="bold">TH</fo:block>
+					</fo:table-cell>
+					<xsl:for-each select="range[position() &gt; 1 and position() &lt; 8]">
+						<fo:table-cell>
+							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.hilight'"/></xsl:call-template>
+							<fo:block space-before="1pt">
+								<xsl:attribute name="font-size">
+									<xsl:choose>
+										<xsl:when test="string-length(to_hit) &gt; 15">6pt</xsl:when>
+										<xsl:otherwise>7pt</xsl:otherwise>
+									</xsl:choose>
+								</xsl:attribute>
+								<xsl:value-of select="to_hit"/>
+							</fo:block>
+						</fo:table-cell>
+					</xsl:for-each>
+				</fo:table-row>
+				<fo:table-row keep-with-next.within-column="always">
+					<!-- Damages -->
+					<fo:table-cell>
+						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
+						<fo:block font-size="6pt" font-weight="bold">Dam</fo:block>
+					</fo:table-cell>
+					<xsl:for-each select="range[position() &gt; 1 and position() &lt; 8]">
+						<fo:table-cell>
+							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.hilight'"/></xsl:call-template>
+							<fo:block font-size="7pt" space-before="1pt">
+								<xsl:value-of select="damage"/>
+							</fo:block>
+						</fo:table-cell>
+					</xsl:for-each>
+				</fo:table-row>
+				</xsl:if>
+<!-- For Thrown Weapons -->
+				
+			
+<!-- New Row For Actual Range with 10 increments 
+		CHOOSE tests for Thrown or Ranged and then grants the -->
+			<xsl:choose>
+			<xsl:when test="contains(rangetype, 'Thrown')">
+				<fo:table-row keep-with-next.within-column="always">
+					<!-- Distances -->
+					<fo:table-cell>
+						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
+					</fo:table-cell>
+
 					<xsl:for-each select="range[position() &lt; 6]">
 						<fo:table-cell>
 							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
@@ -4005,18 +4097,16 @@
 								<xsl:value-of select="damage"/>
 							</fo:block>
 						</fo:table-cell>
-					</xsl:for-each>
+					</xsl:for-each>	
 				</fo:table-row>
-
-<!-- New Row For Actual Range with 10 increments -->
-			<xsl:choose>
-			<xsl:when test="range[position() &gt; 5]">	-->
+			</xsl:when>
+			<xsl:otherwise>
 				<fo:table-row keep-with-next.within-column="always">
 					<!-- Distances -->
 					<fo:table-cell>
 						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
 					</fo:table-cell>
-					<xsl:for-each select="range[position() &gt; 5 and position() &lt; 11]">
+					<xsl:for-each select="range[position() &gt; 6 and position() &lt; 12]">
 						<fo:table-cell>
 							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
 							<fo:block font-size="5pt" font-weight="bold">
@@ -4031,7 +4121,7 @@
 						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
 						<fo:block font-size="6pt" font-weight="bold">TH</fo:block>
 					</fo:table-cell>
-					<xsl:for-each select="range[position() &gt; 5 and position() &lt; 11]">
+					<xsl:for-each select="range[position() &gt; 6 and position() &lt; 12]">
 						<fo:table-cell>
 							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.hilight'"/></xsl:call-template>
 							<fo:block space-before="1pt">
@@ -4052,7 +4142,7 @@
 						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
 						<fo:block font-size="6pt" font-weight="bold">Dam</fo:block>
 					</fo:table-cell>
-					<xsl:for-each select="range[position() &gt; 5 and position() &lt; 11]">
+					<xsl:for-each select="range[position() &gt; 6 and position() &lt; 12]">
 						<fo:table-cell>
 							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.hilight'"/></xsl:call-template>
 							<fo:block font-size="7pt" space-before="1pt">
@@ -4061,8 +4151,9 @@
 						</fo:table-cell>
 					</xsl:for-each>
 				</fo:table-row>
-				</xsl:when>
+				</xsl:otherwise>
 				</xsl:choose>
+
 			</fo:table-body>
 		</fo:table>
 	</xsl:template>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 17151
          http://pcgen.svn.sourceforge.net/pcgen/?rev=17151&view=rev
Author:   amaitland
Date:     2012-09-07 07:33:41 +0000 (Fri, 07 Sep 2012)
Log Message:
-----------

Create a \\\"Temporary Bonus\\\" block
Issue#: OS-124

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_4e_std_grey_light_new.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_condensed_display_grey_light.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_condensed_spell_grey_light.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blackandwhite.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blue.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blue_light.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_green_light.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_grey.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_grey_light.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_red_light.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_yellow_full.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_yellow_light.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_alt_condensed.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/base.xml	2012-09-07 07:33:41 UTC (rev 17151)
@@ -2946,6 +2946,20 @@
 |ENDFOR|
 	</afflictions>
 
+	<!--
+	====================================
+	  ====================================
+			Temporary Bonus
+	  ====================================
+	  ====================================-->
+	<tempbonuses>
+|FOR,%tempbonus,0,COUNT[TEMPBONUSNAMES]-1,1,0|
+		<tempbonus>
+			<name>|TEMPBONUS.%tempbonus.NAME|</name>
+			<description>|TEMPBONUS.%tempbonus.DESC|</description>
+		</tempbonus>
+|ENDFOR|
+	</tempbonuses> 
 
 	<!--
 	  ====================================

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_4e_std_grey_light_new.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_4e_std_grey_light_new.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_4e_std_grey_light_new.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -199,6 +199,12 @@
 		<afflictions.lightline><subattrib light=""/></afflictions.lightline>
 		<afflictions.darkline><subattrib medium=""/></afflictions.darkline>
 
+		<tempbonuses.title><subattrib centre="" inverse=""/></tempbonuses.title>
+		<tempbonuses.border padding="0.5pt"><subattrib border="" inverse=""/></tempbonuses.border>
+		<tempbonuses.lightline><subattrib light=""/></tempbonuses.lightline>
+		<tempbonuses.darkline><subattrib medium=""/></tempbonuses.darkline>
+
+
 		<animal_tricks.title><subattrib centre="" inverse=""/></animal_tricks.title>
 		<animal_tricks.border padding="0.5pt"><subattrib border="" inverse=""/></animal_tricks.border>
 		<animal_tricks.lightline><subattrib light=""/></animal_tricks.lightline>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_condensed_display_grey_light.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_condensed_display_grey_light.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_condensed_display_grey_light.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -200,6 +200,12 @@
 		<afflictions.lightline><subattrib light=""/></afflictions.lightline>
 		<afflictions.darkline><subattrib medium=""/></afflictions.darkline>
 
+		<tempbonuses.title><subattrib centre="" inverse=""/></tempbonuses.title>
+		<tempbonuses.border padding="0.5pt"><subattrib border="" inverse=""/></tempbonuses.border>
+		<tempbonuses.lightline><subattrib light=""/></tempbonuses.lightline>
+		<tempbonuses.darkline><subattrib medium=""/></tempbonuses.darkline>
+
+
 		<animal_tricks.title><subattrib centre="" inverse=""/></animal_tricks.title>
 		<animal_tricks.border padding="0.5pt"><subattrib border="" inverse=""/></animal_tricks.border>
 		<animal_tricks.lightline><subattrib light=""/></animal_tricks.lightline>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_condensed_spell_grey_light.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_condensed_spell_grey_light.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_condensed_spell_grey_light.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -200,6 +200,12 @@
 		<afflictions.lightline><subattrib light=""/></afflictions.lightline>
 		<afflictions.darkline><subattrib medium=""/></afflictions.darkline>
 
+		<tempbonuses.title><subattrib centre="" inverse=""/></tempbonuses.title>
+		<tempbonuses.border padding="0.5pt"><subattrib border="" inverse=""/></tempbonuses.border>
+		<tempbonuses.lightline><subattrib light=""/></tempbonuses.lightline>
+		<tempbonuses.darkline><subattrib medium=""/></tempbonuses.darkline>
+
+
 		<animal_tricks.title><subattrib centre="" inverse=""/></animal_tricks.title>
 		<animal_tricks.border padding="0.5pt"><subattrib border="" inverse=""/></animal_tricks.border>
 		<animal_tricks.lightline><subattrib light=""/></animal_tricks.lightline>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blackandwhite.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blackandwhite.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blackandwhite.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -198,7 +198,13 @@
 		<afflictions.lightline><subattrib light=""/></afflictions.lightline>
 		<afflictions.darkline><subattrib medium=""/></afflictions.darkline>
 
+		<tempbonuses.title><subattrib centre="" inverse=""/></tempbonuses.title>
+		<tempbonuses.border padding="0.5pt"><subattrib border="" inverse=""/></tempbonuses.border>
+		<tempbonuses.lightline><subattrib light=""/></tempbonuses.lightline>
+		<tempbonuses.darkline><subattrib medium=""/></tempbonuses.darkline>
 
+
+
 		<intelligent_items.title><subattrib centre="" inverse=""/></intelligent_items.title>
 		<intelligent_items.border padding="0.5pt"><subattrib border="" inverse=""/></intelligent_items.border>
 		<intelligent_items.lightline><subattrib light=""/></intelligent_items.lightline>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blue.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blue.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blue.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -198,7 +198,13 @@
 		<afflictions.lightline><subattrib light=""/></afflictions.lightline>
 		<afflictions.darkline><subattrib medium=""/></afflictions.darkline>
 
+		<tempbonuses.title><subattrib centre="" inverse=""/></tempbonuses.title>
+		<tempbonuses.border padding="0.5pt"><subattrib border="" inverse=""/></tempbonuses.border>
+		<tempbonuses.lightline><subattrib light=""/></tempbonuses.lightline>
+		<tempbonuses.darkline><subattrib medium=""/></tempbonuses.darkline>
 
+
+
 		<intelligent_items.title><subattrib centre="" inverse=""/></intelligent_items.title>
 		<intelligent_items.border padding="0.5pt"><subattrib border="" inverse=""/></intelligent_items.border>
 		<intelligent_items.lightline><subattrib light=""/></intelligent_items.lightline>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blue_light.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blue_light.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_blue_light.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -198,7 +198,13 @@
 		<afflictions.lightline><subattrib light=""/></afflictions.lightline>
 		<afflictions.darkline><subattrib medium=""/></afflictions.darkline>
 
+		<tempbonuses.title><subattrib centre="" inverse=""/></tempbonuses.title>
+		<tempbonuses.border padding="0.5pt"><subattrib border="" inverse=""/></tempbonuses.border>
+		<tempbonuses.lightline><subattrib light=""/></tempbonuses.lightline>
+		<tempbonuses.darkline><subattrib medium=""/></tempbonuses.darkline>
 
+
+
 		<intelligent_items.title><subattrib centre="" inverse=""/></intelligent_items.title>
 		<intelligent_items.border padding="0.5pt"><subattrib border="" inverse=""/></intelligent_items.border>
 		<intelligent_items.lightline><subattrib light=""/></intelligent_items.lightline>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_green_light.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_green_light.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_green_light.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -198,7 +198,13 @@
 		<afflictions.lightline><subattrib light=""/></afflictions.lightline>
 		<afflictions.darkline><subattrib medium=""/></afflictions.darkline>
 
+		<tempbonuses.title><subattrib centre="" inverse=""/></tempbonuses.title>
+		<tempbonuses.border padding="0.5pt"><subattrib border="" inverse=""/></tempbonuses.border>
+		<tempbonuses.lightline><subattrib light=""/></tempbonuses.lightline>
+		<tempbonuses.darkline><subattrib medium=""/></tempbonuses.darkline>
 
+
+
 		<intelligent_items.title><subattrib centre="" inverse=""/></intelligent_items.title>
 		<intelligent_items.border padding="0.5pt"><subattrib border="" inverse=""/></intelligent_items.border>
 		<intelligent_items.lightline><subattrib light=""/></intelligent_items.lightline>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_grey.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_grey.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_grey.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -198,7 +198,13 @@
 		<afflictions.lightline><subattrib light=""/></afflictions.lightline>
 		<afflictions.darkline><subattrib medium=""/></afflictions.darkline>
 
+		<tempbonuses.title><subattrib centre="" inverse=""/></tempbonuses.title>
+		<tempbonuses.border padding="0.5pt"><subattrib border="" inverse=""/></tempbonuses.border>
+		<tempbonuses.lightline><subattrib light=""/></tempbonuses.lightline>
+		<tempbonuses.darkline><subattrib medium=""/></tempbonuses.darkline>
 
+
+
 		<intelligent_items.title><subattrib centre="" inverse=""/></intelligent_items.title>
 		<intelligent_items.border padding="0.5pt"><subattrib border="" inverse=""/></intelligent_items.border>
 		<intelligent_items.lightline><subattrib light=""/></intelligent_items.lightline>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_grey_light.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_grey_light.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_grey_light.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -193,7 +193,13 @@
 		<afflictions.lightline><subattrib light=""/></afflictions.lightline>
 		<afflictions.darkline><subattrib medium=""/></afflictions.darkline>
 
+		<tempbonuses.title><subattrib centre="" inverse=""/></tempbonuses.title>
+		<tempbonuses.border padding="0.5pt"><subattrib border="" inverse=""/></tempbonuses.border>
+		<tempbonuses.lightline><subattrib light=""/></tempbonuses.lightline>
+		<tempbonuses.darkline><subattrib medium=""/></tempbonuses.darkline>
 
+
+
 		<animal_tricks.title><subattrib centre="" inverse=""/></animal_tricks.title>
 		<animal_tricks.border padding="0.5pt"><subattrib border="" inverse=""/></animal_tricks.border>
 		<animal_tricks.lightline><subattrib light=""/></animal_tricks.lightline>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_red_light.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_red_light.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_red_light.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -199,7 +199,13 @@
 		<afflictions.lightline><subattrib light=""/></afflictions.lightline>
 		<afflictions.darkline><subattrib medium=""/></afflictions.darkline>
 
+		<tempbonuses.title><subattrib centre="" inverse=""/></tempbonuses.title>
+		<tempbonuses.border padding="0.5pt"><subattrib border="" inverse=""/></tempbonuses.border>
+		<tempbonuses.lightline><subattrib light=""/></tempbonuses.lightline>
+		<tempbonuses.darkline><subattrib medium=""/></tempbonuses.darkline>
 
+
+
 		<intelligent_items.title><subattrib centre="" inverse=""/></intelligent_items.title>
 		<intelligent_items.border padding="0.5pt"><subattrib border="" inverse=""/></intelligent_items.border>
 		<intelligent_items.lightline><subattrib light=""/></intelligent_items.lightline>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_yellow_full.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_yellow_full.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_yellow_full.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -198,7 +198,13 @@
 		<afflictions.lightline><subattrib light=""/></afflictions.lightline>
 		<afflictions.darkline><subattrib medium=""/></afflictions.darkline>
 
+		<tempbonuses.title><subattrib centre="" inverse=""/></tempbonuses.title>
+		<tempbonuses.border padding="0.5pt"><subattrib border="" inverse=""/></tempbonuses.border>
+		<tempbonuses.lightline><subattrib light=""/></tempbonuses.lightline>
+		<tempbonuses.darkline><subattrib medium=""/></tempbonuses.darkline>
 
+
+
 		<intelligent_items.title><subattrib centre="" inverse=""/></intelligent_items.title>
 		<intelligent_items.border padding="0.5pt"><subattrib border="" inverse=""/></intelligent_items.border>
 		<intelligent_items.lightline><subattrib light=""/></intelligent_items.lightline>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_yellow_light.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_yellow_light.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_fantasy_std_yellow_light.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -198,6 +198,10 @@
 		<afflictions.lightline><subattrib light=""/></afflictions.lightline>
 		<afflictions.darkline><subattrib medium=""/></afflictions.darkline>
 
+		<tempbonuses.title><subattrib centre="" inverse=""/></tempbonuses.title>
+		<tempbonuses.border padding="0.5pt"><subattrib border="" inverse=""/></tempbonuses.border>
+		<tempbonuses.lightline><subattrib light=""/></tempbonuses.lightline>
+		<tempbonuses.darkline><subattrib medium=""/></tempbonuses.darkline>
 
 		<intelligent_items.title><subattrib centre="" inverse=""/></intelligent_items.title>
 		<intelligent_items.border padding="0.5pt"><subattrib border="" inverse=""/></intelligent_items.border>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_alt_condensed.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_alt_condensed.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_alt_condensed.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -405,6 +405,7 @@
 						<xsl:apply-templates select="weapon_proficiencies"/>
 <!-->						<xsl:apply-templates select="proficiency_specials"/>-->
 						<xsl:apply-templates select="templates"/>
+						<xsl:apply-templates select="tempbonuses"/>
 						<xsl:apply-templates select="prohibited_schools"/>
 						<xsl:apply-templates select="companions"/>
 					</fo:block>
@@ -5961,6 +5962,23 @@
 	<!--
 ====================================
 ====================================
+	TEMPLATE - Temporary Bonuses
+====================================
+====================================-->
+	<xsl:template match="tempbonuses">
+		<xsl:if test="count(tempbonus) &gt; 0">
+			<xsl:call-template name="stripped.list">
+				<xsl:with-param name="attribute" select="'tempbonuses'" />
+				<xsl:with-param name="title" select="'TEMPORARY BONUS'" />
+				<xsl:with-param name="list" select="tempbonus" />
+				<xsl:with-param name="name.tag" select="'name'"/>
+				<xsl:with-param name="desc.tag" select="''"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+	<!--
+====================================
+====================================
 	TEMPLATE - Special Abilities
 ====================================
 ====================================-->

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-09-06 22:53:45 UTC (rev 17150)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-09-07 07:33:41 UTC (rev 17151)
@@ -405,6 +405,7 @@
 						<xsl:apply-templates select="weapon_proficiencies"/>
 <!-->						<xsl:apply-templates select="proficiency_specials"/>-->
 						<xsl:apply-templates select="templates"/>
+						<xsl:apply-templates select="tempbonuses"/>
 						<xsl:apply-templates select="prohibited_schools"/>
 						<xsl:apply-templates select="companions"/>
 					</fo:block>
@@ -5985,6 +5986,23 @@
 	<!--
 ====================================
 ====================================
+	TEMPLATE - Temporary Bonuses
+====================================
+====================================-->
+	<xsl:template match="tempbonuses">
+		<xsl:if test="count(tempbonus) &gt; 0">
+			<xsl:call-template name="stripped.list">
+				<xsl:with-param name="attribute" select="'tempbonuses'" />
+				<xsl:with-param name="title" select="'TEMPORARY BONUS'" />
+				<xsl:with-param name="list" select="tempbonus" />
+				<xsl:with-param name="name.tag" select="'name'"/>
+				<xsl:with-param name="desc.tag" select="''"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+	<!--
+====================================
+====================================
 	TEMPLATE - Special Abilities
 ====================================
 ====================================-->

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 17315
          http://pcgen.svn.sourceforge.net/pcgen/?rev=17315&view=rev
Author:   amaitland
Date:     2012-09-17 06:33:09 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
Fix Thrown Weapons to have all 5 Range Increments
Fix display of "30' Point Blank" to only display if Weapon Doesn't Naturally have a 30' in the ranges

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-09-17 00:24:41 UTC (rev 17314)
+++ Trunk/pcgen/outputsheets/base.xml	2012-09-17 06:33:09 UTC (rev 17315)
@@ -780,7 +780,7 @@
 |IIF(WEAPON.%weap.ISTYPE.Thrown)| <!-- Valid only if we find the Thrown Value -->
 			<ranges>
 				<rangetype>Thrown</rangetype>
-|FOR,%range,0,4,1,0|
+|FOR,%range,0,5,1,0|
 				<range>
 					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
 					<to_hit>|WEAPON.%weap.RANGELIST.%range.TOTALHIT|</to_hit>
@@ -882,7 +882,7 @@
 |IIF(WEAPON.%weap.ISTYPE.Thrown)|
 			
 				<rangetype>Thrown</rangetype>
-|FOR,%range,0,4,1,0|
+|FOR,%range,0,5,1,0|
 				<range>
 					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
 					<to_hit>|WEAPON.%weap.RANGELIST.%range.TOTALHIT|</to_hit>
@@ -922,7 +922,7 @@
 				</ammunition>
 |IIF(WEAPON.%weap.ISTYPE.Thrown)|
 				<rangetype>Thrown</rangetype>
-|FOR,%range,0,4,1,0|
+|FOR,%range,0,5,1,0|
 				<range>
 					<distance>|WEAPON.%weap.RANGELIST.%range|</distance>
 					<to_hit>|WEAPON.%weap.RANGELIST.%range.CONTENTS.%ammo.TOTALHIT|</to_hit>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-09-17 00:24:41 UTC (rev 17314)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-09-17 06:33:09 UTC (rev 17315)
@@ -3855,7 +3855,14 @@
 						</fo:table-cell>
 					</fo:table-row>
 				</xsl:if>
-				<xsl:if test="range[position() &gt; 5 or ../../common/range &gt; 10]">	
+				<xsl:choose>
+				<xsl:when test="range[position()=6 and distance='']">
+				</xsl:when>
+				<xsl:when test="range[position()=11 and distance='']">
+				</xsl:when>
+				<xsl:otherwise>
+	<!-->			<xsl:if test="range[position() &gt; 5]">	-->
+	<!-->		<xsl:if test="range[position() &gt; 5 or ../../common/range &gt; 10]">	-->
 	<!-->			<xsl:if test="count(./ranges/range) = 6 or count(./ranges/range) = 11">-->
 					<fo:table-row keep-with-next.within-column="always">
 						<xsl:for-each select="range[position() &lt; 2]">	
@@ -3885,8 +3892,11 @@
 							</fo:table-cell>
 						</xsl:for-each>	
 					</fo:table-row>
-				</xsl:if>
+			<!-->	</xsl:if>	-->
+				</xsl:otherwise>
+				</xsl:choose>
 
+
 			<xsl:if test="range[position() &gt; 6]">
 				<fo:table-row keep-with-next.within-column="always">
 					<!-- Distances -->
@@ -3999,15 +4009,15 @@
 
 
 			</xsl:when>
-			<xsl:otherwise>
+			<xsl:when test="range[position()=6 and distance='']">
+
 <!-->			<xsl:when test="contains(rangetype, 'Thrown')"> -->
 				<fo:table-row keep-with-next.within-column="always">
 					<!-- Distances -->
 					<fo:table-cell>
 						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
 					</fo:table-cell>
-
-					<xsl:for-each select="range[position() &lt; 6]">
+					<xsl:for-each select="range[position() &lt; 6]">	
 						<fo:table-cell>
 							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
 							<fo:block font-size="5pt" font-weight="bold">
@@ -4022,7 +4032,7 @@
 						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
 						<fo:block font-size="6pt" font-weight="bold">TH</fo:block>
 					</fo:table-cell>
-					<xsl:for-each select="range[position() &lt; 6]">
+					<xsl:for-each select="range[position() &lt; 6]">	
 						<fo:table-cell>
 							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.hilight'"/></xsl:call-template>
 							<fo:block space-before="1pt">
@@ -4052,6 +4062,71 @@
 						</fo:table-cell>
 					</xsl:for-each>	
 				</fo:table-row>
+
+			</xsl:when>
+
+			<xsl:otherwise>
+
+
+<!-->						<xsl:when test="range[position() &lt; 8]">	-->
+				<fo:table-row keep-with-next.within-column="always">
+					<!-- Distances -->
+					<fo:table-cell>
+						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
+					</fo:table-cell>
+
+<!-->					<xsl:for-each select="range[position() &lt; 6]">	-->
+					<xsl:for-each select="range[position() &gt; 1 and position() &lt; 8]">
+						<fo:table-cell>
+							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
+							<fo:block font-size="5pt" font-weight="bold">
+								<xsl:value-of select="distance"/>
+							</fo:block>
+						</fo:table-cell>
+					</xsl:for-each>
+				</fo:table-row>
+				<fo:table-row keep-with-next.within-column="always">
+					<!-- Range To-Hits -->
+					<fo:table-cell>
+						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
+						<fo:block font-size="6pt" font-weight="bold">TH</fo:block>
+					</fo:table-cell>
+	<!-->				<xsl:for-each select="range[position() &lt; 6]">	-->
+						<xsl:for-each select="range[position() &gt; 1 and position() &lt; 8]">
+						<fo:table-cell>
+							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.hilight'"/></xsl:call-template>
+							<fo:block space-before="1pt">
+								<xsl:attribute name="font-size">
+									<xsl:choose>
+										<xsl:when test="string-length(to_hit) &gt; 15">6pt</xsl:when>
+										<xsl:otherwise>7pt</xsl:otherwise>
+									</xsl:choose>
+								</xsl:attribute>
+								<xsl:value-of select="to_hit"/>
+							</fo:block>
+						</fo:table-cell>
+					</xsl:for-each>
+				</fo:table-row>
+				<fo:table-row keep-with-next.within-column="always">
+					<!-- Damages -->
+					<fo:table-cell>
+						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.title'"/></xsl:call-template>
+						<fo:block font-size="6pt" font-weight="bold">Dam</fo:block>
+					</fo:table-cell>
+					<xsl:for-each select="range[position() &gt; 1 and position() &lt; 8]">
+<!--					<xsl:for-each select="range[position() &lt; 6]">	-->
+						<fo:table-cell>
+							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'weapon.hilight'"/></xsl:call-template>
+							<fo:block font-size="7pt" space-before="1pt">
+								<xsl:value-of select="damage"/>
+							</fo:block>
+						</fo:table-cell>
+					</xsl:for-each>	
+				</fo:table-row>
+
+				
+
+
 			</xsl:otherwise>
 		</xsl:choose>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 17906
          http://pcgen.svn.sourceforge.net/pcgen/?rev=17906&view=rev
Author:   amaitland
Date:     2012-10-20 06:56:08 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
Staged items.

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-10-20 06:47:41 UTC (rev 17905)
+++ Trunk/pcgen/outputsheets/base.xml	2012-10-20 06:56:08 UTC (rev 17906)
@@ -1413,16 +1413,18 @@
 
 	<!-- Proficiency lists -->
 	<proficiency_specials>
-|FOR,%ability,0,count("ABILITIES","CATEGORY=Special Ability","TYPE=ProficiencyOutputDisplay")-1,1,0|
-|IIF(ABILITYALL.Special Ability.%ability.TYPE=ProficiencyOutputDisplay)|
+|IIF(count("ABILITIES";"CATEGORY=Special Ability";"TYPE=ProfOutput")==0)|
+|ELSE|
+	<!--  -->
+|ENDIF|
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Special Ability","TYPE=ProfOutput")-1,1,0|
 		<proficiency>
-			<name>|ABILITYALL.Special Ability.%ability.TYPE=ProficiencyOutputDisplay|</name>
-			<proficient>|ABILITYALL.Special Ability.%ability.TYPE=ProficiencyOutputDisplay.ASPECT.Proficiency|</proficient>
-			<forte>|ABILITYALL.Special Ability.%ability.TYPE=ProficiencyOutputDisplay.ASPECT.Forte|</forte>
+			<name>|ABILITYALL.Special Ability.%ability.TYPE=ProfOutput|</name>
+			<proficient>|ABILITYALL.Special Ability.%ability.TYPE=ProfOutput.ASPECT.Proficiency|</proficient>
+			<forte>|ABILITYALL.Special Ability.%ability.TYPE=ProfOutput.ASPECT.Forte|</forte>
 		</proficiency>
-|ENDIF|
 |ENDFOR|
-</proficiency_specials>
+	</proficiency_specials>
 
 <!--
 	  ====================================

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-10-20 06:47:41 UTC (rev 17905)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-10-20 06:56:08 UTC (rev 17906)
@@ -5736,17 +5736,17 @@
 							</fo:table-cell>
 							<fo:table-cell>
 								<fo:block text-align="center" space-before.optimum="1pt" font-size="7pt">
-									<xsl:value-of select="format-number(weight, '####0.0#')"/>
+									<xsl:value-of select="format-number(weight, '####0.#')"/>
 									<xsl:if test="quantity &gt; 1">
-										(<xsl:value-of select="format-number(weight * quantity, '####0.0#')"/>)
+										(<xsl:value-of select="format-number(weight * quantity, '####0.#')"/>)
 									</xsl:if>
 								</fo:block>
 							</fo:table-cell>
 							<fo:table-cell>
 								<fo:block text-align="center" space-before.optimum="1pt" font-size="7pt">
-									<xsl:value-of select="format-number(cost, '####0.0#')"/>
+									<xsl:value-of select="format-number(cost, '####0.#')"/>
 									<xsl:if test="quantity &gt; 1">
-										(<xsl:value-of select="format-number(cost * quantity, '####0.0#')"/>)
+										(<xsl:value-of select="format-number(cost * quantity, '####0.#')"/>)
 									</xsl:if>
 								</fo:block>
 							</fo:table-cell>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 18024
          http://pcgen.svn.sourceforge.net/pcgen/?rev=18024&view=rev
Author:   amaitland
Date:     2012-10-26 15:44:38 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
Fix 'Willpower' to Will and adjust all CHECK.2 to CHECK.WILL

PsiCrystal companion doesnt get statblock on OS
Issue#: OS-211,OS-206

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_generic_export.xml
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop_ws.htm
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_alt_condensed.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
    Trunk/pcgen/outputsheets/d20/modern/pdf/csheet_modern_std.xslt
    Trunk/pcgen/outputsheets/d20/modern/pdf/csheet_modern_std_new.xslt
    Trunk/pcgen/outputsheets/d20/modern/pdf/modern_master_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-10-26 13:42:09 UTC (rev 18023)
+++ Trunk/pcgen/outputsheets/base.xml	2012-10-26 15:44:38 UTC (rev 18024)
@@ -466,15 +466,15 @@
 				<short>will</short>
 			</name>
 			<ability>wisdom</ability>
-			<total>|CHECK.2.TOTAL|</total>
-			<base>|CHECK.2.BASE|</base>
-			<abil_mod>|CHECK.2.STATMOD|</abil_mod>
-			<feats>|CHECK.2.FEATS|</feats>
-			<magic_mod>|CHECK.2.MAGIC|</magic_mod>
-			<misc_mod>|CHECK.2.MISC.NOMAGIC.NOSTAT|</misc_mod>
-			<misc_w_magic_mod>|CHECK.2.MISC.NOSTAT|</misc_w_magic_mod>
-			<race>|CHECK.2.RACE|</race>
-			<epic_mod>|CHECK.2.EPIC|</epic_mod>
+			<total>|CHECK.WILL.TOTAL|</total>
+			<base>|CHECK.WILL.BASE|</base>
+			<abil_mod>|CHECK.WILL.STATMOD|</abil_mod>
+			<feats>|CHECK.WILL.FEATS|</feats>
+			<magic_mod>|CHECK.WILL.MAGIC|</magic_mod>
+			<misc_mod>|CHECK.WILL.MISC.NOMAGIC.NOSTAT|</misc_mod>
+			<misc_w_magic_mod>|CHECK.WILL.MISC.NOSTAT|</misc_w_magic_mod>
+			<race>|CHECK.WILL.RACE|</race>
+			<epic_mod>|CHECK.WILL.EPIC|</epic_mod>
 			<temp_mod/>
 		</saving_throw>
 	</saving_throws>
@@ -3045,7 +3045,7 @@
 			<ac>|FOLLOWERTYPE.FAMILIAR.0.BONUS.COMBAT.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.FAMILIAR.0.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.FAMILIAR.0.CHECK.REFLEX.TOTAL|</reflex>
-			<willpower>|FOLLOWERTYPE.FAMILIAR.0.CHECK.2.TOTAL|</willpower>
+			<will>|FOLLOWERTYPE.FAMILIAR.0.CHECK.WILL.TOTAL|</will>
 			<initiative_mod>|FOLLOWERTYPE.FAMILIAR.0.INITIATIVEMOD|</initiative_mod>
 			<special_properties>|FOLLOWERTYPE.FAMILIAR.0.SPECIALLIST|</special_properties>
 |ENDFOR|
@@ -3090,6 +3090,60 @@
 			</attacks>
 		</familiar>
 |%|
+|%FOLLOWERTYPE.Psicrystal|
+|FOR,%companion,0,COUNT[FOLLOWERTYPE.Psicrystal]-1,1,0|
+		<psicrystal>
+			<name>|FOLLOWERTYPE.Psicrystal.0.NAME|</name>
+			<race>|FOLLOWERTYPE.Psicrystal.0.RACE|</race>
+			<hp>|FOLLOWERTYPE.Psicrystal.0.HP|</hp>
+			<ac>|FOLLOWERTYPE.Psicrystal.0.BONUS.COMBAT.AC.TOTAL|</ac>
+			<fortitude>|FOLLOWERTYPE.Psicrystal.0.CHECK.FORTITUDE.TOTAL|</fortitude>
+			<reflex>|FOLLOWERTYPE.Psicrystal.0.CHECK.REFLEX.TOTAL|</reflex>
+			<will>|FOLLOWERTYPE.Psicrystal.0.CHECK.WILL.TOTAL|</will>
+			<initiative_mod>|FOLLOWERTYPE.Psicrystal.0.INITIATIVEMOD|</initiative_mod>
+			<special_properties>|FOLLOWERTYPE.Psicrystal.0.SPECIALLIST|</special_properties>
+|ENDFOR|
+
+			<attacks>
+|FOR,%weap,0,COUNT[FOLLOWERTYPE.Psicrystal.0.EQTYPE.WEAPON]-1,1,0|
+				<attack>
+					<common>
+						<name>
+							<short>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.NAME|</short>
+							<long>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.LONGNAME|</long>
+						</name>
+						<category>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.CATEGORY|</category>
+						<critical>
+							<range>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.CRIT|</range>
+							<multiplier>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.MULT|</multiplier>
+						</critical>
+						<to_hit>
+							<hit>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.HIT|</hit>
+							<magic_hit>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.MAGICHIT|</magic_hit>
+							<total_hit>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.TOTALHIT|</total_hit>
+						</to_hit>
+						<feat>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.FEAT|</feat>
+						<hand>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.HAND|</hand>
+						<num_attacks>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.NUMATTACKS|</num_attacks>
+						<reach>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.REACH|</reach>
+						<reachunit>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.REACHUNIT|</reachunit>
+						<size>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.SIZE|</size>
+						<special_properties>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.SPROP|</special_properties>
+						<template>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.TEMPLATE|</template>
+						<type>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.TYPE|</type>
+						<weight>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.WT|</weight>
+						<sequence>|%weap|</sequence>
+					</common>
+					<simple>
+						<to_hit>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.TOTALHIT|</to_hit>
+						<damage>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.DAMAGE|</damage>
+						<range>|FOLLOWERTYPE.Psicrystal.0.WEAPON.%weap.RANGE|</range>
+					</simple>
+				</attack>
+|ENDFOR|
+			</attacks>
+		</psicrystal>
+|%|
 |%FOLLOWERTYPE.SPECIAL MOUNT|
 |FOR,%companion,0,COUNT[FOLLOWERTYPE.SPECIAL MOUNT]-1,1,0|
 		<mount>
@@ -3102,7 +3156,7 @@
 			<ac>|FOLLOWERTYPE.SPECIAL MOUNT.0.BONUS.COMBAT.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.REFLEX.TOTAL|</reflex>
-			<willpower>|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.2.TOTAL|</willpower>
+			<will>|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.WILL.TOTAL|</will>
 			<initiative_mod>|FOLLOWERTYPE.SPECIAL MOUNT.0.INITIATIVEMOD|</initiative_mod>
 			<special_properties>|FOLLOWERTYPE.SPECIAL MOUNT.0.SPECIALLIST|</special_properties>
 |ENDFOR|
@@ -3156,11 +3210,11 @@
 			<ac>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.BONUS.COMBAT.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.CHECK.REFLEX.TOTAL|</reflex>
-			<willpower>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.CHECK.2.TOTAL|</willpower>
+			<will>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.CHECK.WILL.TOTAL|</will>
 			<initiative_mod>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.INITIATIVEMOD|</initiative_mod>
 			<special_properties>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.SPECIALLIST|</special_properties>
-			<trick>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.ABILITYALL.Special Ability.VISIBLE.%animalTrick.TYPE=AnimalTrick|</trick>
-|FOR,%trick,0,COUNT[FOLLOWERTYPE.FOLLOWER.%companion.ABILITYALL.Special Ability.VISIBLE.%animalTrick.TYPE=AnimalTrick]-1,1,0|
+|FOR,%companion,0,COUNT[FOLLOWERTYPE.ANIMAL COMPANION.%companion.ABILITYALL.Special Ability.VISIBLE.TYPE=AnimalTrick]-1,1,0|
+			<trick>|FOLLOWERTYPE.ANIMAL COMPANION.ABILITYALL.Special Ability.VISIBLE.%trick.TYPE=AnimalTrick|</trick>
 |ENDFOR|
 |ENDFOR|
 			<attacks>
@@ -3213,7 +3267,7 @@
 			<ac>|FOLLOWERTYPE.FOLLOWER.%companion.BONUS.COMBAT.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.FOLLOWER.%companion.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.FOLLOWER.%companion.CHECK.REFLEX.TOTAL|</reflex>
-			<willpower>|FOLLOWERTYPE.FOLLOWER.%companion.CHECK.2.TOTAL|</willpower>
+			<will>|FOLLOWERTYPE.FOLLOWER.%companion.CHECK.WILL.TOTAL|</will>
 			<initiative_mod>|FOLLOWERTYPE.FOLLOWER.%companion.INITIATIVEMOD|</initiative_mod>
 			<special_properties>|FOLLOWERTYPE.FOLLOWER.%companion.SPECIALLIST|</special_properties>
 			<attacks>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm	2012-10-26 13:42:09 UTC (rev 18023)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm	2012-10-26 15:44:38 UTC (rev 18024)
@@ -371,7 +371,7 @@
 // Set up the table of information about the checks
 CheckArr[FORTindex] = new Check("Fortitude", "Constitution", |CHECK.FORTITUDE.TOTAL|, |CHECK.FORTITUDE.BASE|,2,|CHECK.FORTITUDE.MAGIC|,|CHECK.FORTITUDE.EPIC|,|CHECK.FORTITUDE.MISC.NOMAGIC.NOSTAT|);
 CheckArr[REFindex] = new Check("Reflex", "Dexterity", |CHECK.REFLEX.TOTAL|, |CHECK.REFLEX.BASE|,1,|CHECK.REFLEX.MAGIC|,|CHECK.REFLEX.EPIC|,|CHECK.REFLEX.MISC.NOMAGIC.NOSTAT|);
-CheckArr[WILLindex] = new Check("Willpower", "Wisdom", |CHECK.2.TOTAL|, |CHECK.2.BASE|,4,|CHECK.2.MAGIC|,|CHECK.2.EPIC|,|CHECK.2.MISC.NOMAGIC.NOSTAT|);
+CheckArr[WILLindex] = new Check("Will", "Wisdom", |CHECK.WILL.TOTAL|, |CHECK.WILL.BASE|,4,|CHECK.WILL.MAGIC|,|CHECK.WILL.EPIC|,|CHECK.WILL.MISC.NOMAGIC.NOSTAT|);
 // Set up the attack information table
 ATKArr[0] = new ATK("Melee","|ATTACK.MELEE.TOTAL|","|ATTACK.MELEE|",STRindex,|ATTACK.MELEE.SIZE|,|ATTACK.MELEE.EPIC|,|ATTACK.MELEE.MISC|);
 ATKArr[1] = new ATK("Ranged","|ATTACK.RANGED.TOTAL|","|ATTACK.RANGED|",DEXindex,|ATTACK.RANGED.SIZE|,|ATTACK.RANGED.EPIC|,|ATTACK.RANGED.MISC|);
@@ -3421,7 +3421,7 @@
       <td width="8%" class="c8sw">REF:</td>
       <td width="8%" class="c6w">|FOLLOWERTYPE.FAMILIAR.0.CHECK.REFLEX.TOTAL|</td>
       <td width="8%" class="c8sw">WILL:</td>
-      <td width="8%" class="c6w">|FOLLOWERTYPE.FAMILIAR.0.CHECK.2.TOTAL|</td>
+      <td width="8%" class="c6w">|FOLLOWERTYPE.FAMILIAR.0.CHECK.WILL.TOTAL|</td>
       <td width="8%" class="c8sw">HP:</td>
       <td width="8%" class="c6w">|FOLLOWERTYPE.FAMILIAR.0.HP|</td>
       <td width="8%" class="c8sw">AC:</td>
@@ -3459,7 +3459,7 @@
       <td width="8%" class="c8swB">REF:</td>
       <td width="8%" class="c6s">|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.REFLEX.TOTAL|</td>
       <td width="8%" class="c8swB">WILL:</td>
-      <td width="8%" class="c6s">|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.2.TOTAL|</td>
+      <td width="8%" class="c6s">|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.WILL.TOTAL|</td>
       <td width="8%" class="c8swB">HP:</td>
       <td width="8%" class="c6s">|FOLLOWERTYPE.SPECIAL MOUNT.0.HP|</td>
       <td width="8%" class="c8swB">AC:</td>
@@ -3498,7 +3498,7 @@
       <td width="8%" class="c8swB">REF:</td>
       <td width="8%" class="c6s">|FOLLOWERTYPE.ANIMAL COMPANION.%anm.CHECK.REFLEX.TOTAL|</td>
       <td width="8%" class="c8swB">WILL:</td>
-      <td width="8%" class="c6s">|FOLLOWERTYPE.ANIMAL COMPANION.%anm.CHECK.2.TOTAL|</td>
+      <td width="8%" class="c6s">|FOLLOWERTYPE.ANIMAL COMPANION.%anm.CHECK.WILL.TOTAL|</td>
       <td width="8%" class="c8swB">HP:</td>
       <td width="8%" class="c6s">|FOLLOWERTYPE.ANIMAL COMPANION.%anm.HP|</td>
       <td width="8%" class="c8swB">AC:</td>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_generic_export.xml
===================================================================
(Binary files differ)

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm	2012-10-26 13:42:09 UTC (rev 18023)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm	2012-10-26 15:44:38 UTC (rev 18024)
@@ -924,7 +924,7 @@
 // Set up the table of information about the checks
 CheckArr[FORTindex] = new Check("Fortitude", "Constitution", |CHECK.FORTITUDE.TOTAL|, |CHECK.FORTITUDE.BASE|,2,|CHECK.FORTITUDE.MAGIC|,|CHECK.FORTITUDE.EPIC|,|CHECK.FORTITUDE.MISC.NOMAGIC.NOSTAT|);
 CheckArr[REFindex] = new Check("Reflex", "Dexterity", |CHECK.REFLEX.TOTAL|, |CHECK.REFLEX.BASE|,1,|CHECK.REFLEX.MAGIC|,|CHECK.REFLEX.EPIC|,|CHECK.REFLEX.MISC.NOMAGIC.NOSTAT|);
-CheckArr[WILLindex] = new Check("Willpower", "Wisdom", |CHECK.2.TOTAL|, |CHECK.2.BASE|,4,|CHECK.2.MAGIC|,|CHECK.2.EPIC|,|CHECK.2.MISC.NOMAGIC.NOSTAT|);
+CheckArr[WILLindex] = new Check("Will", "Wisdom", |CHECK.WILL.TOTAL|, |CHECK.WILL.BASE|,4,|CHECK.WILL.MAGIC|,|CHECK.WILL.EPIC|,|CHECK.WILL.MISC.NOMAGIC.NOSTAT|);
 // Set up the attack information table
 ATKArr[0] = new ATK("Melee","|ATTACK.MELEE.TOTAL|","|ATTACK.MELEE|",STRindex,|ATTACK.MELEE.SIZE|,|ATTACK.MELEE.EPIC|,|ATTACK.MELEE.MISC|);
 ATKArr[1] = new ATK("Ranged","|ATTACK.RANGED.TOTAL|","|ATTACK.RANGED|",DEXindex,|ATTACK.RANGED.SIZE|,|ATTACK.RANGED.EPIC|,|ATTACK.RANGED.MISC|);
@@ -6355,7 +6355,7 @@
 					<td width="8%" class="c8swB">REF:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.FAMILIAR.0.CHECK.REFLEX.TOTAL|</td>
 					<td width="8%" class="c8swB">WILL:</td>
-					<td width="8%" class="c8wB">|FOLLOWERTYPE.FAMILIAR.0.CHECK.2.TOTAL|</td>
+					<td width="8%" class="c8wB">|FOLLOWERTYPE.FAMILIAR.0.CHECK.WILL.TOTAL|</td>
 					<td width="8%" class="c8swB">HP:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.FAMILIAR.0.HP|</td>
 					<td width="8%" class="c8swB">AC:</td>
@@ -6404,7 +6404,7 @@
 					<td width="8%" class="c8swB">REF:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.REFLEX.TOTAL|</td>
 					<td width="8%" class="c8swB">WILL:</td>
-					<td width="8%" class="c8wB">|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.2.TOTAL|</td>
+					<td width="8%" class="c8wB">|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.WILL.TOTAL|</td>
 					<td width="8%" class="c8swB">HP:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.SPECIAL MOUNT.0.HP|</td>
 					<td width="8%" class="c8swB">AC:</td>
@@ -6452,7 +6452,7 @@
 					<td width="8%" class="c8swB">REF:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.MOUNT.0.CHECK.REFLEX.TOTAL|</td>
 					<td width="8%" class="c8swB">WILL:</td>
-					<td width="8%" class="c8wB">|FOLLOWERTYPE.MOUNT.0.CHECK.2.TOTAL|</td>
+					<td width="8%" class="c8wB">|FOLLOWERTYPE.MOUNT.0.CHECK.WILL.TOTAL|</td>
 					<td width="8%" class="c8swB">HP:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.MOUNT.0.HP|</td>
 					<td width="8%" class="c8swB">AC:</td>
@@ -6501,7 +6501,7 @@
 					<td width="8%" class="c8swB">REF:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.ANIMAL COMPANION.%anm.CHECK.REFLEX.TOTAL|</td>
 					<td width="8%" class="c8swB">WILL:</td>
-					<td width="8%" class="c8wB">|FOLLOWERTYPE.ANIMAL COMPANION.%anm.CHECK.2.TOTAL|</td>
+					<td width="8%" class="c8wB">|FOLLOWERTYPE.ANIMAL COMPANION.%anm.CHECK.WILL.TOTAL|</td>
 					<td width="8%" class="c8swB">HP:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.ANIMAL COMPANION.%anm.HP|</td>
 					<td width="8%" class="c8swB">AC:</td>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop_ws.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop_ws.htm	2012-10-26 13:42:09 UTC (rev 18023)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop_ws.htm	2012-10-26 15:44:38 UTC (rev 18024)
@@ -924,7 +924,7 @@
 // Set up the table of information about the checks
 CheckArr[FORTindex] = new Check("Fortitude", "Constitution", |CHECK.FORTITUDE.TOTAL|, |CHECK.FORTITUDE.BASE|,2,|CHECK.FORTITUDE.MAGIC|,|CHECK.FORTITUDE.EPIC|,|CHECK.FORTITUDE.MISC.NOMAGIC.NOSTAT|);
 CheckArr[REFindex] = new Check("Reflex", "Dexterity", |CHECK.REFLEX.TOTAL|, |CHECK.REFLEX.BASE|,1,|CHECK.REFLEX.MAGIC|,|CHECK.REFLEX.EPIC|,|CHECK.REFLEX.MISC.NOMAGIC.NOSTAT|);
-CheckArr[WILLindex] = new Check("Willpower", "Wisdom", |CHECK.2.TOTAL|, |CHECK.2.BASE|,4,|CHECK.2.MAGIC|,|CHECK.2.EPIC|,|CHECK.2.MISC.NOMAGIC.NOSTAT|);
+CheckArr[WILLindex] = new Check("Will", "Wisdom", |CHECK.WILL.TOTAL|, |CHECK.WILL.BASE|,4,|CHECK.WILL.MAGIC|,|CHECK.WILL.EPIC|,|CHECK.WILL.MISC.NOMAGIC.NOSTAT|);
 // Set up the attack information table
 ATKArr[0] = new ATK("Melee","|ATTACK.MELEE.TOTAL|","|ATTACK.MELEE|",STRindex,|ATTACK.MELEE.SIZE|,|ATTACK.MELEE.EPIC|,|ATTACK.MELEE.MISC|);
 ATKArr[1] = new ATK("Ranged","|ATTACK.RANGED.TOTAL|","|ATTACK.RANGED|",DEXindex,|ATTACK.RANGED.SIZE|,|ATTACK.RANGED.EPIC|,|ATTACK.RANGED.MISC|);
@@ -6327,7 +6327,7 @@
 					<td width="8%" class="c8swB">REF:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.FAMILIAR.0.CHECK.REFLEX.TOTAL|</td>
 					<td width="8%" class="c8swB">WILL:</td>
-					<td width="8%" class="c8wB">|FOLLOWERTYPE.FAMILIAR.0.CHECK.2.TOTAL|</td>
+					<td width="8%" class="c8wB">|FOLLOWERTYPE.FAMILIAR.0.CHECK.WILL.TOTAL|</td>
 					<td width="8%" class="c8swB">HP:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.FAMILIAR.0.HP|</td>
 					<td width="8%" class="c8swB">AC:</td>
@@ -6376,7 +6376,7 @@
 					<td width="8%" class="c8swB">REF:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.REFLEX.TOTAL|</td>
 					<td width="8%" class="c8swB">WILL:</td>
-					<td width="8%" class="c8wB">|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.2.TOTAL|</td>
+					<td width="8%" class="c8wB">|FOLLOWERTYPE.SPECIAL MOUNT.0.CHECK.WILL.TOTAL|</td>
 					<td width="8%" class="c8swB">HP:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.SPECIAL MOUNT.0.HP|</td>
 					<td width="8%" class="c8swB">AC:</td>
@@ -6424,7 +6424,7 @@
 					<td width="8%" class="c8swB">REF:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.MOUNT.0.CHECK.REFLEX.TOTAL|</td>
 					<td width="8%" class="c8swB">WILL:</td>
-					<td width="8%" class="c8wB">|FOLLOWERTYPE.MOUNT.0.CHECK.2.TOTAL|</td>
+					<td width="8%" class="c8wB">|FOLLOWERTYPE.MOUNT.0.CHECK.WILL.TOTAL|</td>
 					<td width="8%" class="c8swB">HP:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.MOUNT.0.HP|</td>
 					<td width="8%" class="c8swB">AC:</td>
@@ -6473,7 +6473,7 @@
 					<td width="8%" class="c8swB">REF:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.ANIMAL COMPANION.%anm.CHECK.REFLEX.TOTAL|</td>
 					<td width="8%" class="c8swB">WILL:</td>
-					<td width="8%" class="c8wB">|FOLLOWERTYPE.ANIMAL COMPANION.%anm.CHECK.2.TOTAL|</td>
+					<td width="8%" class="c8wB">|FOLLOWERTYPE.ANIMAL COMPANION.%anm.CHECK.WILL.TOTAL|</td>
 					<td width="8%" class="c8swB">HP:</td>
 					<td width="8%" class="c8wB">|FOLLOWERTYPE.ANIMAL COMPANION.%anm.HP|</td>
 					<td width="8%" class="c8swB">AC:</td>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_alt_condensed.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_alt_condensed.xslt	2012-10-26 13:42:09 UTC (rev 18023)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_alt_condensed.xslt	2012-10-26 15:44:38 UTC (rev 18024)
@@ -5480,7 +5480,7 @@
 							<xsl:with-param name="attribute" select="'companions'"/>
 						</xsl:call-template>
 						<fo:block font-size="8pt">
-							<xsl:value-of select="willpower"/>
+							<xsl:value-of select="will"/>
 						</fo:block>
 					</fo:table-cell>
 				</fo:table-row>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-10-26 13:42:09 UTC (rev 18023)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-10-26 15:44:38 UTC (rev 18024)
@@ -5317,6 +5317,7 @@
 	<xsl:template match="companions">
 		<!-- BEGIN Companions Table -->
 		<xsl:apply-templates select="familiar"/>
+		<xsl:apply-templates select="psicrystal"/>
 		<xsl:apply-templates select="mount"/>
 		<xsl:apply-templates select="companion"/>
 		<xsl:call-template name="followers.list"/>
@@ -5329,6 +5330,13 @@
 		</xsl:call-template>
 		<!-- END Familiar Table -->
 	</xsl:template>
+	<xsl:template match="psicrystal">
+		<!-- BEGIN psicrystal Table -->
+		<xsl:call-template name="show_companion">
+			<xsl:with-param name="followerType" select="'Psicrystal'"/>
+		</xsl:call-template>
+		<!-- END psicrystal Table -->
+	</xsl:template>
 	<xsl:template match="mount">
 		<!-- BEGIN Familiar Table -->
 		<xsl:call-template name="show_companion">
@@ -5479,7 +5487,7 @@
 							<xsl:with-param name="attribute" select="'companions'"/>
 						</xsl:call-template>
 						<fo:block font-size="8pt">
-							<xsl:value-of select="willpower"/>
+							<xsl:value-of select="will"/>
 						</fo:block>
 					</fo:table-cell>
 				</fo:table-row>
@@ -7096,8 +7104,8 @@
 		</fo:table-footer>
 	</xsl:template>
 	<!--
+====================================	
 ====================================
-====================================
 	TEMPLATE - KNOWN SPELL HEADER COLUMN TITLES
 ====================================
 ====================================-->
@@ -7162,7 +7170,9 @@
 		</xsl:variable>
 		<xsl:variable name="baseconcentration" select="../../@concentration">
 		</xsl:variable>
-		<fo:table-row keep-with-next.within-column="always">
+<!-->	New to keep Spell Details togather	
+		<fo:table-body>	-->
+		<fo:table-row keep-with-next.within-column="always"	 keep-together="always">
 			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="concat('spelllist.', $shade)"/></xsl:call-template>
 				
 			<xsl:choose>
@@ -7365,7 +7375,7 @@
 				</fo:block>
 			</fo:table-cell>
 		</fo:table-row>
-
+<!-->		</fo:table-body>	-->
 	</xsl:template>
 	<!--
 ====================================

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-10-26 13:42:09 UTC (rev 18023)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-10-26 15:44:38 UTC (rev 18024)
@@ -5578,7 +5578,7 @@
 							<xsl:with-param name="attribute" select="'companions'"/>
 						</xsl:call-template>
 						<fo:block font-size="8pt">
-							<xsl:value-of select="willpower"/>
+							<xsl:value-of select="will"/>
 						</fo:block>
 					</fo:table-cell>
 				</fo:table-row>

Modified: Trunk/pcgen/outputsheets/d20/modern/pdf/csheet_modern_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/modern/pdf/csheet_modern_std.xslt	2012-10-26 13:42:09 UTC (rev 18023)
+++ Trunk/pcgen/outputsheets/d20/modern/pdf/csheet_modern_std.xslt	2012-10-26 15:44:38 UTC (rev 18024)
@@ -3287,7 +3287,7 @@
 					<fo:table-cell xsl:use-attribute-sets="companions.title" text-align="end"><fo:block  font-size="8pt">REF:</fo:block></fo:table-cell>
 					<fo:table-cell xsl:use-attribute-sets="companions"><fo:block font-size="8pt"><xsl:value-of select="reflex"/></fo:block></fo:table-cell>
 					<fo:table-cell xsl:use-attribute-sets="companions.title" text-align="end"><fo:block  font-size="8pt">WILL:</fo:block></fo:table-cell>
-					<fo:table-cell xsl:use-attribute-sets="companions"><fo:block font-size="8pt"><xsl:value-of select="willpower"/></fo:block></fo:table-cell>
+					<fo:table-cell xsl:use-attribute-sets="companions"><fo:block font-size="8pt"><xsl:value-of select="will"/></fo:block></fo:table-cell>
 				</fo:table-row>
 				<xsl:for-each select="attacks/attack">
 					<xsl:if test="string-length(common/name/long) &gt; 0">

Modified: Trunk/pcgen/outputsheets/d20/modern/pdf/csheet_modern_std_new.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/modern/pdf/csheet_modern_std_new.xslt	2012-10-26 13:42:09 UTC (rev 18023)
+++ Trunk/pcgen/outputsheets/d20/modern/pdf/csheet_modern_std_new.xslt	2012-10-26 15:44:38 UTC (rev 18024)
@@ -2874,7 +2874,7 @@
 					<fo:table-cell xsl:use-attribute-sets="companions.title" text-align="end"><fo:block  font-size="8pt">REF:</fo:block></fo:table-cell>
 					<fo:table-cell xsl:use-attribute-sets="companions"><fo:block font-size="8pt"><xsl:value-of select="reflex"/></fo:block></fo:table-cell>
 					<fo:table-cell xsl:use-attribute-sets="companions.title" text-align="end"><fo:block  font-size="8pt">WILL:</fo:block></fo:table-cell>
-					<fo:table-cell xsl:use-attribute-sets="companions"><fo:block font-size="8pt"><xsl:value-of select="willpower"/></fo:block></fo:table-cell>
+					<fo:table-cell xsl:use-attribute-sets="companions"><fo:block font-size="8pt"><xsl:value-of select="will"/></fo:block></fo:table-cell>
 				</fo:table-row>
 				<xsl:for-each select="attacks/attack">
 					<xsl:if test="string-length(common/name/long) &gt; 0">

Modified: Trunk/pcgen/outputsheets/d20/modern/pdf/modern_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/modern/pdf/modern_master_std.xslt	2012-10-26 13:42:09 UTC (rev 18023)
+++ Trunk/pcgen/outputsheets/d20/modern/pdf/modern_master_std.xslt	2012-10-26 15:44:38 UTC (rev 18024)
@@ -4327,7 +4327,7 @@
 							<xsl:with-param name="attribute" select="'companions'"/>
 						</xsl:call-template>
 						<fo:block font-size="8pt">
-							<xsl:value-of select="willpower"/>
+							<xsl:value-of select="will"/>
 						</fo:block>
 					</fo:table-cell>
 				</fo:table-row>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 18033
          http://pcgen.svn.sourceforge.net/pcgen/?rev=18033&view=rev
Author:   amaitland
Date:     2012-10-27 06:13:24 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
Fix bug: Animal Tricks not being displayed in Companion Block of master
Issue#: OS-213

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-10-27 05:55:49 UTC (rev 18032)
+++ Trunk/pcgen/outputsheets/base.xml	2012-10-27 06:13:24 UTC (rev 18033)
@@ -3215,7 +3215,7 @@
 			<will>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.CHECK.WILL.TOTAL|</will>
 			<initiative_mod>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.INITIATIVEMOD|</initiative_mod>
 			<special_properties>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.ABILITYALLLIST.Special Ability.VISIBLE.TYPE=SpecialAttack||FOLLOWERTYPE.ANIMAL COMPANION.%companion.ABILITYALLLIST.Special Ability.VISIBLE.TYPE=SpecialQuality|</special_properties>
-			<trick>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.ABILITYLIST.Special Ability.VISIBLE.%animalTrick.TYPE=AnimalTrick|</trick>
+			<trick>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.ABILITYALLLIST.Special Ability.VISIBLE.TYPE=AnimalTrick|</trick>
 			<attacks>
 |FOR,%weap,0,COUNT[FOLLOWERTYPE.ANIMAL COMPANION.%companion.EQTYPE.WEAPON]-1,1,0|
 				<attack>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-10-27 05:55:49 UTC (rev 18032)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-10-27 06:13:24 UTC (rev 18033)
@@ -5353,7 +5353,7 @@
 	</xsl:template>
 	<xsl:template name="followers.list">
 		<xsl:if test="count(follower) &gt; 0">
-			<fo:table table-layout="fixed" space-after.optimum="2mm">
+			<fo:table table-layout="fixed" space-after.optimum="2mm" keep-together="always">
 				<fo:table-column>
 					<xsl:attribute name="column-width"><xsl:value-of select="0.5 * ($pagePrintableWidth - 2)" />mm</xsl:attribute>
 				</fo:table-column>
@@ -5384,7 +5384,7 @@
 	</xsl:template>
 	<xsl:template name="show_companion">
 		<xsl:param name="followerType" select="Follower"/>
-		<fo:table table-layout="fixed" space-before.optimum="2mm">
+		<fo:table table-layout="fixed" space-before.optimum="2mm" keep-together="always">
 				<fo:table-column>
 					<xsl:attribute name="column-width"><xsl:value-of select="0.5 * ($pagePrintableWidth - 2) - 69" />mm</xsl:attribute>
 				</fo:table-column>
@@ -5393,7 +5393,7 @@
 			<fo:table-column column-width="14mm"/>
 			<fo:table-column column-width="13mm"/>
 			<fo:table-column column-width="14mm"/>
-			<fo:table-body>
+			<fo:table-body keep-together="always">
 				<fo:table-row>
 					<fo:table-cell number-columns-spanned="6">
 						<xsl:call-template name="attrib">
@@ -5568,7 +5568,7 @@
 						</fo:block>
 					</fo:table-cell>
 				</fo:table-row>
-			<!-->	<xsl:if test="count(companion/trick) &gt; 0">	-->
+				<xsl:if test="count(trick) &gt; 0">
 					<fo:table-row keep-with-next.within-column="always">
 						<fo:table-cell text-align="end">
 							<xsl:call-template name="attrib">
@@ -5585,7 +5585,7 @@
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>
-		<!-->		</xsl:if> -->
+				</xsl:if>
 			</fo:table-body>
 		</fo:table>
 	</xsl:template>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-10-27 05:55:49 UTC (rev 18032)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-10-27 06:13:24 UTC (rev 18033)
@@ -5416,6 +5416,7 @@
 	<xsl:template match="companions">
 		<!-- BEGIN Companions Table -->
 		<xsl:apply-templates select="familiar"/>
+		<xsl:apply-templates select="psicrystal"/>
 		<xsl:apply-templates select="mount"/>
 		<xsl:apply-templates select="companion"/>
 		<xsl:call-template name="followers.list"/>
@@ -5427,6 +5428,12 @@
 			<xsl:with-param name="followerType" select="'Familiar'"/>
 		</xsl:call-template>
 		<!-- END Familiar Table -->
+	<xsl:template match="psicrystal">
+		<!-- BEGIN Familiar Table -->
+		<xsl:call-template name="show_companion">
+			<xsl:with-param name="followerType" select="'Psicrystal'"/>
+		</xsl:call-template>
+		<!-- END Familiar Table -->
 	</xsl:template>
 	<xsl:template match="mount">
 		<!-- BEGIN Familiar Table -->
@@ -5475,7 +5482,7 @@
 	</xsl:template>
 	<xsl:template name="show_companion">
 		<xsl:param name="followerType" select="Follower"/>
-		<fo:table table-layout="fixed" space-before.optimum="2mm">
+		<fo:table table-layout="fixed" space-before.optimum="2mm" keep-together="always">
 				<fo:table-column>
 					<xsl:attribute name="column-width"><xsl:value-of select="0.5 * ($pagePrintableWidth - 2) - 69" />mm</xsl:attribute>
 				</fo:table-column>
@@ -5484,7 +5491,7 @@
 			<fo:table-column column-width="14mm"/>
 			<fo:table-column column-width="13mm"/>
 			<fo:table-column column-width="14mm"/>
-			<fo:table-body>
+			<fo:table-body keep-together="column">
 				<fo:table-row>
 					<fo:table-cell number-columns-spanned="6">
 						<xsl:call-template name="attrib">
@@ -5659,7 +5666,7 @@
 						</fo:block>
 					</fo:table-cell>
 				</fo:table-row>
-			<!-->	<xsl:if test="count(companion/trick) &gt; 0">	-->
+				<xsl:if test="count(trick) &gt; 0">
 					<fo:table-row keep-with-next.within-column="always">
 						<fo:table-cell text-align="end">
 							<xsl:call-template name="attrib">
@@ -5676,7 +5683,7 @@
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>
-		<!-->		</xsl:if> -->
+				</xsl:if>
 			</fo:table-body>
 		</fo:table>
 	</xsl:template>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 18038
          http://pcgen.svn.sourceforge.net/pcgen/?rev=18038&view=rev
Author:   amaitland
Date:     2012-10-27 09:29:59 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
Align text to Left for Special Properties and Tricks.

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-10-27 08:47:10 UTC (rev 18037)
+++ Trunk/pcgen/outputsheets/base.xml	2012-10-27 09:29:59 UTC (rev 18038)
@@ -159,7 +159,6 @@
 			<trait>|PERSONALITY1|</trait>
 			<trait>|PERSONALITY2|</trait>
 		</personality>
-<!-->		<portrait>|PORTRAIT|</portrait>-->
 		<portrait>
 			<portrait>|PORTRAIT|</portrait>
 			<portrait_thumb>|PORTRAIT.THUMB|</portrait_thumb>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-10-27 08:47:10 UTC (rev 18037)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-10-27 09:29:59 UTC (rev 18038)
@@ -5394,7 +5394,7 @@
 			<fo:table-column column-width="13mm"/>
 			<fo:table-column column-width="14mm"/>
 			<fo:table-body keep-together="always">
-				<fo:table-row>
+				<fo:table-row keep-with-next.within-column="always">
 					<fo:table-cell number-columns-spanned="6">
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'companions.title'"/>
@@ -5553,7 +5553,7 @@
 					</xsl:if>
 				</xsl:for-each>
 				<fo:table-row keep-with-next.within-column="always">
-					<fo:table-cell text-align="end">
+					<fo:table-cell text-align="left">
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'companions.title'"/>
 						</xsl:call-template>
@@ -5563,18 +5563,18 @@
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'companions'"/>
 						</xsl:call-template>
-						<fo:block font-size="7pt">
+						<fo:block font-size="7pt" text-align="left">
 							<xsl:value-of select="special_properties"/>
 						</fo:block>
 					</fo:table-cell>
 				</fo:table-row>
 				<xsl:if test="count(trick) &gt; 0">
 					<fo:table-row keep-with-next.within-column="always">
-						<fo:table-cell text-align="end">
+						<fo:table-cell text-align="left">
 							<xsl:call-template name="attrib">
 								<xsl:with-param name="attribute" select="'companions.title'"/>
 							</xsl:call-template>
-							<fo:block font-size="8pt">Tricks:</fo:block>
+							<fo:block font-size="8pt" text-align="left">Tricks:</fo:block>
 						</fo:table-cell>
 						<fo:table-cell number-columns-spanned="5">
 							<xsl:call-template name="attrib">

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-10-27 08:47:10 UTC (rev 18037)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-10-27 09:29:59 UTC (rev 18038)
@@ -5493,7 +5493,7 @@
 			<fo:table-column column-width="13mm"/>
 			<fo:table-column column-width="14mm"/>
 			<fo:table-body keep-together="always">
-				<fo:table-row>
+				<fo:table-row keep-with-next.within-column="always">
 					<fo:table-cell number-columns-spanned="6">
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'companions.title'"/>
@@ -5652,7 +5652,7 @@
 					</xsl:if>
 				</xsl:for-each>
 				<fo:table-row keep-with-next.within-column="always">
-					<fo:table-cell text-align="end">
+					<fo:table-cell text-align="left">
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'companions.title'"/>
 						</xsl:call-template>
@@ -5662,18 +5662,18 @@
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'companions'"/>
 						</xsl:call-template>
-						<fo:block font-size="7pt">
+						<fo:block font-size="7pt" text-align="left">
 							<xsl:value-of select="special_properties"/>
 						</fo:block>
 					</fo:table-cell>
 				</fo:table-row>
 				<xsl:if test="count(trick) &gt; 0">
 					<fo:table-row keep-with-next.within-column="always">
-						<fo:table-cell text-align="end">
+						<fo:table-cell text-align="left">
 							<xsl:call-template name="attrib">
 								<xsl:with-param name="attribute" select="'companions.title'"/>
 							</xsl:call-template>
-							<fo:block font-size="8pt">Tricks:</fo:block>
+							<fo:block font-size="8pt" text-align="left">Tricks:</fo:block>
 						</fo:table-cell>
 						<fo:table-cell number-columns-spanned="5">
 							<xsl:call-template name="attrib">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 18145
          http://pcgen.svn.sourceforge.net/pcgen/?rev=18145&view=rev
Author:   amaitland
Date:     2012-11-04 17:27:21 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
TIMEUNIT needs to be added for Spell Support
- Also adds Deity Structure for future support (Not Working yet)
Issue#: OS-99

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_condensed_spell_grey_light.xslt
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_common.xsl
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-11-04 16:34:13 UTC (rev 18144)
+++ Trunk/pcgen/outputsheets/base.xml	2012-11-04 17:27:21 UTC (rev 18145)
@@ -85,18 +85,21 @@
 		</classes>
 		<deity>
 			<name>|DEITY|</name>
-			<alignment>|DEITY.ALIGNMENT|</alignment>
-			<description>|DEITY.DESCRIPTION|</description>
-			<domainlist>|DEITY.DOMAINLIST|</domainlist>
-			<favoredweapon>|DEITY.FAVOREDWEAPON|</favoredweapon>
-			<holyitem>|DEITY.HOLYITEM|</holyitem>
-			<pantheonlist>|DEITY.PANTHEONLIST|</pantheonlist>
-			<source>|DEITY.SOURCE|</source>
-			<special_abilities>|DEITY.SA|</special_abilities>
-			<appearance>|DEITY.APPEARANCE|</appearance>
-			<title>|DEITY.TITLE|</title>
-			<worshippers>|DEITY.WORSHIPPERS|</worshippers>
 		</deity>
+		<deity_info>
+				<name>|DEITY|</name>
+				<alignment>|DEITY.ALIGNMENT|</alignment>
+				<description>|DEITY.DESCRIPTION|</description>
+				<domainlist>|DEITY.DOMAINLIST|</domainlist>
+				<favoredweapon>|DEITY.FAVOREDWEAPON|</favoredweapon>
+				<holyitem>|DEITY.HOLYITEM|</holyitem>
+				<pantheonlist>|DEITY.PANTHEONLIST|</pantheonlist>
+				<source>|DEITY.SOURCE|</source>
+				<special_abilities>|DEITY.SA|</special_abilities>
+				<appearance>|DEITY.APPEARANCE|</appearance>
+				<title>|DEITY.TITLE|</title>
+				<worshippers>|DEITY.WORSHIPPERS|</worshippers>
+		</deity_info>
 		<description>|DESC|</description>
 		<experience>
 			<current>|EXP.CURRENT|</current>
@@ -657,6 +660,20 @@
 |ENDIF|
 <!-- End Spirit Weapon - Ranged -->
 
+	<!-- Blank Natural Attack -->
+|FOR,%NaturalAttack,0,count("ABILITIES","CATEGORY=Natural Attack","Name=BlankNaturalAttack")-1,1,0|
+	<naturalattack>
+		<name>Weapon</name>
+		<tohit></tohit>
+		<damage></damage>
+		<type></type>
+		<threat></threat>
+		<reach></reach>
+		<range></range>
+		<rangeincrement>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackRangeIncrement|</rangeincrement>
+		<notes>|ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.ASPECT.NaturalAttackNotes||ABILITYALL.Natural Attack.%NaturalAttack.TYPE=NaturalAttack.DESC|</notes>
+|ENDFOR|
+
 	<!-- Natural Attack -->
 |FOR,%NaturalAttack,0,count("ABILITIES","CATEGORY=Natural Attack","TYPE=NaturalAttack")-1,1,0|
 	<naturalattack>
@@ -2258,9 +2275,84 @@
 		</power_classfeature>
 |ENDFOR|
 	</powers_classfeatures>
-	<!--
+
+		<!--
 	  ====================================
 	  ====================================
+			POWERS - CLASSFEATURES
+	  ====================================
+	  ====================================-->
+	<powers_classfeatures>
+|IIF(count("ABILITIES";"CATEGORY=Power";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=Class Feature")==0)|
+|ELSE|
+	<!-- Standard Special Qualities -->
+|ENDIF|
+|FOR,%classFeature,0,count("ABILITIES","CATEGORY=Power","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=Class Feature")-1,1,0|
+		<power_classfeature>
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.TYPE:Extraordinary)|
+			<name>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature| (Ex)</name>
+|ELSE|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.TYPE:Supernatural)|
+			<name>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature| (Su)</name>
+|ELSE|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.TYPE:SpellLike)|
+			<name>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature| (Sp)</name>
+|ELSE|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.TYPE:PsiLike)|
+			<name>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature| (Ps)</name>
+|ELSE|
+			<name>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.DESC|</description>
+
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASPECT.Sustain|</sustain>
+|ENDIF|
+			<type>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.TYPE|</type>
+			<associated>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Power.VISIBLE.%classFeature.TYPE=Class Feature.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Power</category>
+		</power_classfeature>
+|ENDFOR|
+	</powers_classfeatures><!--
+	  ====================================
+	  ====================================
 			POWERS - FEATPOWERS
 	  ====================================
 	  ====================================-->
@@ -2409,9 +2501,86 @@
 		</powers_atwill>
 |ENDFOR|
 	</powers_atwills>
+
 	<!--
 	  ====================================
 	  ====================================
+			4e Powers - At-Will
+	  ====================================
+	  ====================================-->
+	<powers_atwills>
+|IIF(count("ABILITIES";"CATEGORY=Power";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=At-Will")==0)|
+|ELSE|
+	<!-- Standard At Will Powers -->
+|ENDIF|
+|FOR,%atWill,0,count("ABILITIES","CATEGORY=Power","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=At-Will")-1,1,0|
+		<powers_atwill>
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.TYPE:Extraordinary)|
+			<name>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will| (Ex)</name>
+|ELSE|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.TYPE:Supernatural)|
+			<name>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will| (Su)</name>
+|ELSE|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.TYPE:SpellLike)|
+			<name>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will| (Sp)</name>
+|ELSE|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.TYPE:PsiLike)|
+			<name>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will| (Ps)</name>
+|ELSE|
+			<name>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.HASASPECT.Power Use:Y)|
+			<power_use>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASPECT.Power Use|</power_use>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.HASASPECT.Power Type:Y)|
+			<power_type>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASPECT.Power Type|</power_type>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.HASASPECT.Action Type:Y)|
+			<action_type>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASPECT.Action Type|</action_type>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.HASASPECT.Special:Y)|
+			<special>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASPECT.Special|</special>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.HASASPECT.Trigger:Y)|
+			<trigger>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASPECT.Trigger|</trigger>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.HASASPECT.Target:Y)|
+			<target>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASPECT.Target|</target>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.HASASPECT.Attack:Y)|
+			<attack>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASPECT.Attack|</attack>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.HASASPECT.Hit:Y)|
+			<hit>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASPECT.Hit|</hit>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.HASASPECT.Miss:Y)|
+			<miss>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASPECT.Miss|</miss>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.HASASPECT.Effect:Y)|
+			<effect>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASPECT.Effect|</effect>
+|ENDIF|
+|IIF(ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.HASASPECT.Sustain:Y)|
+			<sustain>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASPECT.Sustain|</sustain>
+|ENDIF|
+			<description>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.DESC|</description>
+			<type>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.TYPE|</type>
+			<associated>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Power</category>
+			<source>|ABILITYALL.Power.VISIBLE.%atWill.TYPE=At-Will.SOURCE|</source>
+		</powers_atwill>
+|ENDFOR|
+	</powers_atwills>
+
+	<!--
+	  ====================================
+	  ====================================
 			4e Powers - Encounter
 	  ====================================
 	  ====================================-->

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_condensed_spell_grey_light.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_condensed_spell_grey_light.xslt	2012-11-04 16:34:13 UTC (rev 18144)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/csheet_condensed_spell_grey_light.xslt	2012-11-04 17:27:21 UTC (rev 18145)
@@ -336,6 +336,13 @@
 		<salient_divine_abilities.lightline><subattrib light=""/></salient_divine_abilities.lightline>
 		<salient_divine_abilities.darkline><subattrib medium=""/></salient_divine_abilities.darkline>
 
+		<deity.title><subattrib centre="" inverse=""/></deity.title>
+		<deity.border padding="0.5pt"><subattrib border="" inverse=""/></deity.border>
+		<deity.lightline><subattrib light=""/></deity.lightline>
+		<deity.darkline><subattrib medium=""/></deity.darkline>
+
+
+
 		<feats.title><subattrib centre="" inverse=""/></feats.title>
 		<feats.border padding="0.5pt"><subattrib border="" inverse=""/></feats.border>
 		<feats.lightline><subattrib light=""/></feats.lightline>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_common.xsl
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_common.xsl	2012-11-04 16:34:13 UTC (rev 18144)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_common.xsl	2012-11-04 17:27:21 UTC (rev 18145)
@@ -476,7 +476,150 @@
 		</fo:table>
 	</xsl:template>
 
+<!--
+====================================
+====================================
+	TEMPLATE - Deity Display
+====================================
+====================================-->
+	<xsl:template name="deity.display">
+		<xsl:param name="attribute"/>
+		<xsl:param name="title" />
+		<xsl:param name="deitytitle.tag"  />
+		<xsl:param name="list" />
+		<xsl:param name="name.tag" />
+		<xsl:param name="desc.tag" />
+		<xsl:param name="alignment.tag"  />
+		<xsl:param name="domainlist.tag"  />
+		<xsl:param name="favoredweapon.tag"  />
+		<xsl:param name="holyitem.tag" />
+		<xsl:param name="pantheonlist.tag"  />
+		<xsl:param name="source.tag"  />
+		<xsl:param name="special_abilities.tag"  />
+		<xsl:param name="appearance.tag"  />
+		<xsl:param name="worshippers.tag"  />
 
+		<fo:table table-layout="fixed" space-before="2mm" border-collapse="collapse" padding="0.5pt">
+			<xsl:call-template name="attrib">
+				<xsl:with-param name="attribute" select="concat($attribute, '.border')"/>
+			</xsl:call-template>
+			<fo:table-column>
+			    <xsl:attribute name="column-width"><xsl:value-of select="($pagePrintableWidth - 2) div 2" />mm</xsl:attribute>
+			</fo:table-column>
+			<fo:table-body>
+				<fo:table-row keep-with-next.within-column="always">
+					<fo:table-cell padding-top="1pt" number-columns-spanned="1">
+						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="concat($attribute, '.title')"/></xsl:call-template>
+						<fo:block font-size="9pt"><xsl:value-of select="$title"/></fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+				
+					<xsl:variable name="shade">
+						<xsl:choose>
+							<xsl:when test="position() mod 2 = 0">darkline</xsl:when>
+							<xsl:otherwise>lightline</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+				
+<!-->					<xsl:if test="string-length(./*[name()=$name.tag]) &gt; 1">	-->
+						<fo:table-row keep-with-next.within-column="always">
+							<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="concat($attribute, '.', $shade)"/></xsl:call-template>
+							<fo:table-cell padding="1pt">
+								<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="concat($attribute, '.', $shade)"/></xsl:call-template>
+								<fo:block font-size="9pt"  text-align="left" font-weight="bold">
+									<xsl:value-of select="./*[name()=$name.tag]"/>
+								</fo:block>
+								<fo:block font-size="7pt" text-align="right" font-weight="bold">
+									<xsl:value-of select="./*[name()=$deitytitle.tag]"/>
+								</fo:block>
+								<xsl:if test="string-length(./*[name()=$desc.tag]) &gt; 0">
+									<fo:block font-size="5pt" font-style="italic"  text-align="center" >
+										<xsl:call-template name="paragraghlist">
+											<xsl:with-param name="tag" select="$desc.tag"/>
+										</xsl:call-template>
+									</fo:block>
+								</xsl:if>
+						<!-->		<xsl:if test="string-length(./*[name()=$alignment.tag]) &gt; 0">	-->
+									<fo:block font-size="7pt" text-align="left" text-indent="5pt">
+										<fo:inline font-weight="bold">Power Use  </fo:inline>
+										<xsl:call-template name="paragraghlist">
+											<xsl:with-param name="tag" select="$alignment.tag"/>
+										</xsl:call-template>
+									</fo:block>
+						<!-->		</xsl:if>	-->
+
+
+							<!-->	<xsl:if test="string-length(./*[name()=$domainlist.tag]) &gt; 0">	-->
+									<fo:block font-size="7pt" text-align="left" text-indent="5pt">
+										<fo:inline font-weight="bold">Power Use  </fo:inline>
+										<xsl:call-template name="paragraghlist">
+											<xsl:with-param name="tag" select="$domainlist.tag"/>
+										</xsl:call-template>
+									</fo:block>
+						<!-->		</xsl:if>	-->
+								<xsl:if test="string-length(./*[name()=$favoredweapon.tag]) &gt; 0">
+									<fo:block font-size="7pt" text-align="left" text-indent="5pt">
+										<fo:inline font-weight="bold">Power Use  </fo:inline>
+										<xsl:call-template name="paragraghlist">
+											<xsl:with-param name="tag" select="$favoredweapon.tag"/>
+										</xsl:call-template>
+									</fo:block>
+								</xsl:if>
+								<xsl:if test="string-length(./*[name()=$holyitem.tag]) &gt; 0">
+									<fo:block font-size="7pt" text-align="left" text-indent="5pt">
+										<fo:inline font-weight="bold">Power Use  </fo:inline>
+										<xsl:call-template name="paragraghlist">
+											<xsl:with-param name="tag" select="$holyitem.tag"/>
+										</xsl:call-template>
+									</fo:block>
+								</xsl:if>
+								<xsl:if test="string-length(./*[name()=$pantheonlist.tag]) &gt; 0">
+									<fo:block font-size="7pt" text-align="left" text-indent="5pt">
+										<fo:inline font-weight="bold">Power Use  </fo:inline>
+										<xsl:call-template name="paragraghlist">
+											<xsl:with-param name="tag" select="$pantheonlist.tag"/>
+										</xsl:call-template>
+									</fo:block>
+								</xsl:if>
+								<xsl:if test="string-length(./*[name()=$source.tag]) &gt; 0">
+									<fo:block font-size="7pt" text-align="left" text-indent="5pt">
+										<fo:inline font-weight="bold">Power Use  </fo:inline>
+										<xsl:call-template name="paragraghlist">
+											<xsl:with-param name="tag" select="$source.tag"/>
+										</xsl:call-template>
+									</fo:block>
+								</xsl:if>
+								<xsl:if test="string-length(./*[name()=$special_abilities.tag]) &gt; 0">
+									<fo:block font-size="7pt" text-align="left" text-indent="5pt">
+										<fo:inline font-weight="bold">Power Use  </fo:inline>
+										<xsl:call-template name="paragraghlist">
+											<xsl:with-param name="tag" select="$special_abilities.tag"/>
+										</xsl:call-template>
+									</fo:block>
+								</xsl:if>
+								<xsl:if test="string-length(./*[name()=$appearance.tag]) &gt; 0">
+									<fo:block font-size="7pt" text-align="left" text-indent="5pt">
+										<fo:inline font-weight="bold">Power Use  </fo:inline>
+										<xsl:call-template name="paragraghlist">
+											<xsl:with-param name="tag" select="$appearance.tag"/>
+										</xsl:call-template>
+									</fo:block>
+								</xsl:if>
+								<xsl:if test="string-length(./*[name()=$worshippers.tag]) &gt; 0">
+									<fo:block font-size="7pt" text-align="left" text-indent="5pt">
+										<fo:inline font-weight="bold">Power Use  </fo:inline>
+										<xsl:call-template name="paragraghlist">
+											<xsl:with-param name="tag" select="$worshippers.tag"/>
+										</xsl:call-template>
+									</fo:block>
+								</xsl:if>
+							</fo:table-cell>
+						</fo:table-row>
+	<!-->				</xsl:if>	-->
+				
+			</fo:table-body>
+		</fo:table>
+	</xsl:template>
 	<!--
 ====================================
 ====================================

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-11-04 16:34:13 UTC (rev 18144)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-11-04 17:27:21 UTC (rev 18145)
@@ -401,6 +401,7 @@
 						<xsl:apply-templates select="salient_divine_abilities"/>
 						<xsl:apply-templates select="leadership"/>
 						<xsl:apply-templates select="feats"/>
+						<xsl:apply-templates select="deity"/>
 						<xsl:apply-templates select="domains"/>
 						<xsl:apply-templates select="weapon_proficiencies"/>
 <!-->						<xsl:apply-templates select="proficiency_specials"/>-->
@@ -408,6 +409,7 @@
 						<xsl:apply-templates select="tempbonuses"/>
 						<xsl:apply-templates select="prohibited_schools"/>
 						<xsl:apply-templates select="companions"/>
+						
 					</fo:block>
 				</fo:flow>
 			</fo:page-sequence>
@@ -5262,6 +5264,7 @@
 		</xsl:call-template>
 		<!-- END Domains Table -->
 	</xsl:template>
+
 	<!--
 ====================================
 ====================================
@@ -6117,10 +6120,37 @@
 		</xsl:if>
 	</xsl:template>
 
-
 	<!--
 ====================================
 ====================================
+	TEMPLATE - DEITY
+====================================
+====================================-->
+	<xsl:template match="deity">
+<!-->		<xsl:if test="count(deity) &gt; 0">	-->
+<!-->			<xsl:call-template name="bold.list">	
+				<xsl:with-param name="attribute" select="'deity'" />
+				<xsl:with-param name="title" select="'Deity Details'" />
+				<xsl:with-param name="list" select="deity"/>
+				<xsl:with-param name="name.tag" select="'name'"/>
+				<xsl:with-param name="desc.tag" select="'description'"/>
+				<xsl:with-param name="alignment.tag" select="'alignment'"/>
+				<xsl:with-param name="domainlist.tag" select="'domainlist'"/>
+				<xsl:with-param name="favoredweapon.tag" select="'favoredweapon'"/>
+				<xsl:with-param name="holyitem.tag" select="'holyitem'"/>
+				<xsl:with-param name="pantheonlist.tag" select="'pantheonlist'"/>
+				<xsl:with-param name="source.tag" select="'source'"/>
+				<xsl:with-param name="special_abilities.tag" select="'special_abilities'"/>
+				<xsl:with-param name="appearance.tag" select="'appearance'"/>
+				<xsl:with-param name="deitytitle.tag" select="'title'"/>
+				<xsl:with-param name="worshippers.tag" select="'worshippers'"/>
+			</xsl:call-template>	-->
+<!-->		</xsl:if>	-->
+	</xsl:template>
+	
+	<!--
+====================================
+====================================
 	TEMPLATE - SPECIAL ATTACKS
 ====================================
 ====================================-->
@@ -6152,6 +6182,7 @@
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:template>
+
 	<!--	
 ====================================
 ====================================
@@ -6752,7 +6783,7 @@
 						<xsl:with-param name="title" select="'Innate Racial Spells'"/>
 					</xsl:call-template>
 					<fo:table-body>
-						<xsl:apply-templates select="spell" mode="details">
+						<xsl:apply-templates select="spell" mode="innate_details">
 							<xsl:with-param name="columnOne" select="'Times'"/>
 						</xsl:apply-templates>
 					</fo:table-body>
@@ -6775,7 +6806,7 @@
 						<xsl:with-param name="title" select="concat(@name, ' Spell-like Abilities')"/>
 					</xsl:call-template>
 					<fo:table-body>
-						<xsl:apply-templates select="spell" mode="details">
+						<xsl:apply-templates select="spell" mode="innate_details">
 							<xsl:with-param name="columnOne" select="'Times'"/>
 						</xsl:apply-templates>
 					</fo:table-body>
@@ -7141,9 +7172,6 @@
 			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt" font-weight="bold">School</fo:block>
 			</fo:table-cell>
-<!-->			<fo:table-cell padding-top="1pt">
-				<fo:block text-align="start" font-size="5pt" font-weight="bold">Saving Throw</fo:block>
-			</fo:table-cell> -->
 			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt" font-weight="bold">Time</fo:block>
 			</fo:table-cell>
@@ -7153,15 +7181,6 @@
 			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt" font-weight="bold">Range</fo:block>
 			</fo:table-cell>
-<!-->			<fo:table-cell padding-top="1pt" number-columns-spanned="1">
-				<fo:block text-align="start" font-size="5pt" font-weight="bold">Target</fo:block>		Caster Level	
-			</fo:table-cell>	<-->
-<!-->			<fo:table-cell padding-top="1pt">
-				<fo:block text-align="start" font-size="5pt" font-weight="bold">Spell Resistance</fo:block>
-			</fo:table-cell>	-->
-<!-->			<fo:table-cell padding-top="1pt">
-				<fo:block text-align="start" font-size="5pt" font-weight="bold">School</fo:block>
-			</fo:table-cell>	<-->
 			<fo:table-cell padding-top="1pt" number-columns-spanned="1">
 				<fo:block text-align="right" font-size="5pt" font-weight="bold">Source</fo:block>		<!--> Source / Now target is taking both blocks-->
 			</fo:table-cell>
@@ -7185,8 +7204,7 @@
 		</xsl:variable>
 		<xsl:variable name="baseconcentration" select="../../@concentration">
 		</xsl:variable>
-<!-->	New to keep Spell Details togather	
-		<fo:table-body>	-->
+
 		<fo:table-row keep-with-next.within-column="always"	 keep-together="always">
 			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="concat('spelllist.', $shade)"/></xsl:call-template>
 				
@@ -7247,10 +7265,7 @@
 							<xsl:value-of select="school/fullschool"/>
 						</fo:block>
 			</fo:table-cell>
-<!-->			<fo:table-cell padding-top="1pt">
-				<fo:block text-align="start" font-size="5pt">
-				</fo:block>
-			</fo:table-cell>	-->
+
 			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt">
 					<xsl:value-of select="castingtime"/>
@@ -7266,12 +7281,7 @@
 					<xsl:value-of select="range"/>
 				</fo:block>
 			</fo:table-cell>
-<!-->			<fo:table-cell padding-top="1pt" number-columns-spanned="1">
-				<fo:block text-align="start" font-size="5pt">
-					<fo:inline font-style="italic">Target: </fo:inline>	
-					<xsl:value-of select="target"/>
-				</fo:block>	
-			</fo:table-cell>	-->
+
 			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="right" font-size="5pt" number-columns-spanned="1">
 					<xsl:value-of select="source/sourceshort"/>
@@ -7279,68 +7289,166 @@
 					<xsl:value-of select="source/sourcepage"/>
 				</fo:block>
 			</fo:table-cell>	
-<!-->			<fo:table-cell padding-top="1pt">
+
+		</fo:table-row>
+
+<!-- Second Row = For Spell Descriptions -->
+		<fo:table-row>
+			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="concat('spelllist.', $shade)"/></xsl:call-template>
+			<fo:table-cell padding-top="1pt" number-columns-spanned="10">
+<!-- Set Up Alternate FONT SIZE		<xsl:if test="string-length(effect) &gt; 100">-->
+	
 				<fo:block text-align="start" font-size="5pt">
-					<xsl:value-of select="school/fullschool"/>
+				<xsl:if test="string-length(components) &gt; 0">
+					<fo:inline font-weight="bold">[<xsl:value-of select="components"/>]</fo:inline>
+					<fo:inline> </fo:inline>
+				</xsl:if>
+					<fo:inline font-weight="bold"> TARGET: </fo:inline><xsl:value-of select="target"/>
+					<fo:inline>; </fo:inline>
+					<fo:inline font-style="italic" font-weight="bold" font-size="5pt">EFFECT: </fo:inline>
+<xsl:if test="string-length(effect) &gt; 150">
+					<fo:inline font-size="7pt"><xsl:value-of select="effect"/></fo:inline>
+</xsl:if>
+<xsl:if test="string-length(effect) &lt; 151">
+	<fo:inline font-size="5pt"><xsl:value-of select="effect"/></fo:inline>
+</xsl:if>
+					
+						<xsl:if test="string-length(spell_resistance) &gt; 0 or dc &gt; 0"><fo:inline> [</fo:inline>
+							<xsl:if test="string-length(spell_resistance) &gt; 0">
+								<fo:inline font-weight="bold">SR:</fo:inline>
+								<xsl:value-of select="spell_resistance"/>
+							</xsl:if>
+							<xsl:choose>
+								<xsl:when test="dc &gt; 0">
+									<fo:inline>; </fo:inline><fo:inline font-weight="bold">DC:</fo:inline> <xsl:value-of select="dc"/> 
+									<fo:inline>, </fo:inline> <xsl:value-of select="saveinfo"/>
+								</xsl:when>
+								<xsl:when test="/character/house_var/spelldisplaydc &gt; 0">
+									<fo:inline>; </fo:inline><fo:inline font-weight="bold">DC: N/A</fo:inline>
+								</xsl:when>
+								<xsl:otherwise>
+								</xsl:otherwise>
+							</xsl:choose>
+						<fo:inline>] </fo:inline>
+						</xsl:if>
+					<xsl:if test="concentration != $baseconcentration">
+						<fo:inline>; </fo:inline>
+						<fo:inline font-style="italic" font-weight="bold">CONCENTRATION:</fo:inline>
+						<xsl:value-of select="concentration"/>
+					</xsl:if>
+					
 				</fo:block>
-			</fo:table-cell>	 number-columns-spanned="1"	<!-->
-	<!-->		<fo:table-cell padding-top="1pt">
-				<fo:block text-align="start" font-size="5pt">	-->
-	<!-->				<fo:inline font-style="italic">Target: </fo:inline>	-->
-						
-	<!-->				<xsl:value-of select="source/sourceshort"/>
-					<xsl:text>: </xsl:text>
-					<xsl:value-of select="source/sourcepage"/>	-->
-	<!-->			</fo:block>
-			</fo:table-cell>				-->
+			</fo:table-cell>
 		</fo:table-row>
-<!-- Second Row -->
-<!-->		<fo:table-row>
-			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="concat('spelllist.', $shade)"/></xsl:call-template>	-->
-<!-->			<fo:table-cell padding-top="1pt" number-columns-spanned="6">
-				<fo:block text-align="start" font-size="5pt">
-					<fo:inline font-style="italic">Effect: </fo:inline>
-					<fo:block text-align="justify" text-indent="5pt">
-						<xsl:call-template name="paragraghlist">
-							<xsl:with-param name="tag" select="'effect'"/>
-						</xsl:call-template>
-					</fo:block>
+	</xsl:template>
+
+<!--
+====================================
+====================================
+	TEMPLATE - SPELL INNATE DETAILS
+====================================
+====================================-->
+<!--	This is to display the Racial and Class Innate and make use of the x/y format	-->
+	<xsl:template match="spell" mode="innate_details">
+		<xsl:param name="columnOne" select="'Times'"/>
+		<xsl:variable name="shade">
+			<xsl:choose>
+				<xsl:when test="position() mod 2 = 0">darkline</xsl:when>
+				<xsl:otherwise>lightline</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="basecasterlevel" select="../../@spellcasterlevel">
+		</xsl:variable>
+		<xsl:variable name="baseconcentration" select="../../@concentration">
+		</xsl:variable>
+
+		<fo:table-row keep-with-next.within-column="always"	 keep-together="always">
+			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="concat('spelllist.', $shade)"/></xsl:call-template>
+				
+			<xsl:choose>
+				<xsl:when test="$columnOne = 'Times'">
+					<xsl:choose>
+						<xsl:when test="times_memorized &gt;= 0">
+							<fo:table-cell padding-top="0pt">
+								<fo:block text-align="start" font-size="8pt" font-family="ZapfDingbats">
+									<xsl:call-template name="for.loop">
+										<xsl:with-param name="count" select="times_memorized"/>
+									</xsl:call-template>
+								</fo:block>
+							</fo:table-cell>
+						</xsl:when>
+						<xsl:otherwise>
+							<fo:table-cell padding-top="1pt" text-align="start">
+								<fo:block text-align="start" font-size="7pt">At Will</fo:block>
+							</fo:table-cell>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:when>
+				<xsl:when test="$columnOne = 'Boxes'">
+					<fo:table-cell padding-top="0pt">
+						<fo:block text-align="start" font-size="8pt" font-family="ZapfDingbats">
+							<xsl:call-template name="for.loop">
+								<xsl:with-param name="count" select="5"/>
+							</xsl:call-template>
+						</fo:block>
+					</fo:table-cell>
+				</xsl:when>
+				<xsl:when test="$columnOne = 'PowerPoints'">
+					<fo:table-cell padding-top="0pt">
+						<fo:block text-align="start" font-size="8pt">
+							<xsl:variable name="ppcount" select="((../@number)*2)-1"/>
+							<xsl:choose>
+								<xsl:when test="number($ppcount) &gt; 0">
+									<xsl:value-of select="$ppcount"/>
+								</xsl:when>
+								<xsl:otherwise>0/1</xsl:otherwise>
+							</xsl:choose>
+						</fo:block>
+					</fo:table-cell>
+				</xsl:when>
+			</xsl:choose>
+			<fo:table-cell padding-top="1pt" number-columns-spanned="1">
+				<fo:block text-align="start" font-size="7pt" font-weight="bold">
+				<fo:inline font-style="italic">	<xsl:value-of select="bonusspell"/>	</fo:inline>
+						<xsl:choose>
+						<xsl:when test="times_memorized &gt;= 1">
+						(<xsl:value-of select="times_memorized"/>/<xsl:value-of select="times_unit"/>) 
+						</xsl:when>
+						</xsl:choose>
+						<xsl:value-of select="name"/>
 				</fo:block>
-			</fo:table-cell>	-->
-<!-->			<fo:table-cell padding-top="1pt" number-columns-spanned="2">
+			</fo:table-cell>
+			<fo:table-cell padding-top="1pt">
+						<fo:block text-align="start" font-size="5pt" font-weight="bold">
+							<xsl:value-of select="school/fullschool"/>
+						</fo:block>
+			</fo:table-cell>
+			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt">
-					<fo:inline font-style="italic">School: </fo:inline>
-					<xsl:value-of select="school/fullschool"/>
+					<xsl:value-of select="castingtime"/>
 				</fo:block>
 			</fo:table-cell>
-			<fo:table-cell padding-top="1pt" number-columns-spanned="1">
+			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt">
-					<fo:inline font-style="italic">SR: </fo:inline>
-					<xsl:value-of select="spell_resistance"/>
+					<xsl:value-of select="duration"/>
 				</fo:block>
 			</fo:table-cell>
-			<fo:table-cell padding-top="1pt" number-columns-spanned="3">
+			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt">
-					<fo:inline font-style="italic">Target: </fo:inline>
-					<xsl:value-of select="target"/>
+					<xsl:value-of select="range"/>
 				</fo:block>
 			</fo:table-cell>
-			<fo:table-cell padding-top="1pt" number-columns-spanned="1">
-				<fo:block text-align="start" font-size="5pt">
-					<fo:inline font-style="italic">Caster Level: </fo:inline>
-					<xsl:value-of select="casterlevel"/>
+
+			<fo:table-cell padding-top="1pt">
+				<fo:block text-align="right" font-size="5pt" number-columns-spanned="1">
+					<xsl:value-of select="source/sourceshort"/>
+					<xsl:text>:</xsl:text>
+					<xsl:value-of select="source/sourcepage"/>
 				</fo:block>
-			</fo:table-cell>	-->
-			<!-- Placeholder for future concentration for spells -->
-<!--			<fo:table-cell padding-top="1pt" number-columns-spanned="2">
-				<fo:block text-align="start" font-size="5pt">
-					<xsl:if test="concentration != ''">
-						<fo:inline font-style="italic">Concentration: </fo:inline>
-						<xsl:value-of select="concentration"/>
-					</xsl:if>
-				</fo:block>
 			</fo:table-cell>	
-		</fo:table-row>		-->
+
+		</fo:table-row>
+
 <!-- Third Row = For Spell Descriptions -->
 		<fo:table-row>
 			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="concat('spelllist.', $shade)"/></xsl:call-template>
@@ -7380,10 +7488,12 @@
 							</xsl:choose>
 						<fo:inline>] </fo:inline>
 						</xsl:if>
+						(<fo:inline font-weight="bold">Caster Level:</fo:inline>
+						<xsl:value-of select="casterlevel"/>)
 		<!-->			<xsl:if test="concentration != ''">	-->
 					<xsl:if test="concentration != $baseconcentration">
 						<fo:inline>; </fo:inline>
-						<fo:inline font-style="italic" font-weight="bold">CONCENTRATION:</fo:inline>
+						<fo:inline font-style="italic" font-weight="bold">Concentration:</fo:inline>
 						<xsl:value-of select="concentration"/>
 					</xsl:if>
 					
@@ -7392,6 +7502,7 @@
 		</fo:table-row>
 <!-->		</fo:table-body>	-->
 	</xsl:template>
+
 	<!--
 ====================================
 ====================================

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 18901
          http://sourceforge.net/p/pcgen/code/18901
Author:   amaitland
Date:     2012-12-30 22:15:00 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
[Pathfinder] Show Words of Power on output sheet
Issue#: OS-220

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-12-30 21:16:46 UTC (rev 18900)
+++ Trunk/pcgen/outputsheets/base.xml	2012-12-30 22:15:00 UTC (rev 18901)
@@ -1906,6 +1906,48 @@
 |ENDFOR|
 	</intelligent_items>
 
+<!--
+	  ====================================
+	  ====================================
+			Words of Power
+	  ====================================
+	  ====================================-->
+	<words_of_powers>
+|IIF(count("ABILITIES";"CATEGORY=Words of Power";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=WordOfPowerOutput")==0)|
+|ELSE|
+	<!-- Words of Power OS Output -->
+|ENDIF|
+|FOR,%wordsofPower,0,count("ABILITIES","CATEGORY=Words of Power","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=WordOfPowerOutput")-1,1,0|
+		<words_of_power>
+|IIF(ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.TYPE:Extraordinary)|
+			<name>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput| (Ex)</name>
+|ELSE|
+|IIF(ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.TYPE:Supernatural)|
+			<name>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput| (Su)</name>
+|ELSE|
+|IIF(ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.TYPE:SpellLike)|
+			<name>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput| (Sp)</name>
+|ELSE|
+|IIF(ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.TYPE:PsiLike)|
+			<name>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput| (Ps)</name>
+|ELSE|
+			<name>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput|</name>
+|ENDIF|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<description>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.DESC|</description>
+			<type>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.TYPE|</type>
+			<associated>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.ASSOCIATEDCOUNT|</count>
+			<auto>F</auto>
+			<hidden>F</hidden>
+			<virtual>F</virtual>
+			<category>Words of Power</category>
+			<source>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.SOURCE|</source>
+		</words_of_power>
+|ENDFOR|
+	</words_of_powers>
 
 	<!--
 	  ====================================

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-12-30 21:16:46 UTC (rev 18900)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-12-30 22:15:00 UTC (rev 18901)
@@ -368,6 +368,7 @@
 						<xsl:apply-templates select="special_qualities"/>
 						<xsl:apply-templates select="intelligent_items"/>
 						<xsl:apply-templates select="talents"/>	
+						<xsl:apply-templates select="words_of_power"/>
 						<!-- Eclipse Section - Having it's own section is creating an additional blank page -->
 						<xsl:apply-templates select="charcreations"/>
 						<xsl:apply-templates select="disadvantages"/>
@@ -6255,6 +6256,28 @@
 		</xsl:if>
 	</xsl:template>
 
+
+
+			<!--
+====================================
+====================================
+	TEMPLATE - words_of_power
+====================================
+====================================-->
+	<xsl:template match="words_of_powers">
+		<xsl:if test="count(words_of_power) &gt; 0">
+			<xsl:call-template name="bold.list">
+				<xsl:with-param name="attribute" select="'words_of_powers'"/>
+				<xsl:with-param name="title" select="'Words of Power'"/>
+				<xsl:with-param name="list" select="words_of_power"/>
+				<xsl:with-param name="name.tag" select="'name'"/>
+				<xsl:with-param name="desc.tag" select="'description'"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+
+
+
 <!--> ECLIPSE Addons -->
 	<!--
 ====================================

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 18935
          http://sourceforge.net/p/pcgen/code/18935
Author:   amaitland
Date:     2012-12-31 21:57:16 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
[Pathfinder] Show Words of Power on output sheet
Issue#: OS-220

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2012-12-31 21:14:18 UTC (rev 18934)
+++ Trunk/pcgen/outputsheets/base.xml	2012-12-31 21:57:16 UTC (rev 18935)
@@ -1906,45 +1906,26 @@
 |ENDFOR|
 	</intelligent_items>
 
-<!--
+	<!--
 	  ====================================
 	  ====================================
 			Words of Power
 	  ====================================
 	  ====================================-->
 	<words_of_powers>
-|IIF(count("ABILITIES";"CATEGORY=Words of Power";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=WordOfPowerOutput")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Words of Power";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY";"TYPE=WordsOfPowerOutput")==0)|
 |ELSE|
-	<!-- Words of Power OS Output -->
+	<!-- Words of Power -->
 |ENDIF|
-|FOR,%wordsofPower,0,count("ABILITIES","CATEGORY=Words of Power","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=WordOfPowerOutput")-1,1,0|
+|FOR,%wordsofpower,0,count("ABILITIES","CATEGORY=Words of Power","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY","TYPE=WordsOfPowerOutput")-1,1,0|
 		<words_of_power>
-|IIF(ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.TYPE:Extraordinary)|
-			<name>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput| (Ex)</name>
-|ELSE|
-|IIF(ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.TYPE:Supernatural)|
-			<name>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput| (Su)</name>
-|ELSE|
-|IIF(ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.TYPE:SpellLike)|
-			<name>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput| (Sp)</name>
-|ELSE|
-|IIF(ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.TYPE:PsiLike)|
-			<name>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput| (Ps)</name>
-|ELSE|
-			<name>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput|</name>
-|ENDIF|
-|ENDIF|
-|ENDIF|
-|ENDIF|
-			<description>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.DESC|</description>
-			<type>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.TYPE|</type>
-			<associated>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.ASSOCIATED|</associated>
-			<count>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.ASSOCIATEDCOUNT|</count>
-			<auto>F</auto>
-			<hidden>F</hidden>
-			<virtual>F</virtual>
+			<name>|ABILITYALL.Words of Power.VISIBLE.%wordsofpower.TYPE=WordsOfPowerOutput|</name>
+			<description>|ABILITYALL.Words of Power.VISIBLE.%wordsofpower.TYPE=WordsOfPowerOutput.DESC|</description>
+			<type>|ABILITYALL.Words of Power.VISIBLE.%wordsofpower.TYPE=WordsOfPowerOutput.TYPE|</type>
+			<associated>|ABILITYALL.Words of Power.VISIBLE.%wordsofpower.TYPE=WordsOfPowerOutput.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Words of Power.VISIBLE.%wordsofpower.TYPE=WordsOfPowerOutput.ASSOCIATEDCOUNT|</count>
 			<category>Words of Power</category>
-			<source>|ABILITYALL.Words of Power.VISIBLE.%wordsofPower.TYPE=WordOfPowerOutput.SOURCE|</source>
+			<source>|ABILITYALL.Words of Power.VISIBLE.%wordsofpower.TYPE=WordsOfPowerOutput.SOURCE|</source>
 		</words_of_power>
 |ENDFOR|
 	</words_of_powers>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-12-31 21:14:18 UTC (rev 18934)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_spell_condensed.xslt	2012-12-31 21:57:16 UTC (rev 18935)
@@ -368,7 +368,7 @@
 						<xsl:apply-templates select="special_qualities"/>
 						<xsl:apply-templates select="intelligent_items"/>
 						<xsl:apply-templates select="talents"/>	
-						<xsl:apply-templates select="words_of_power"/>
+						<xsl:apply-templates select="words_of_powers"/>
 						<!-- Eclipse Section - Having it's own section is creating an additional blank page -->
 						<xsl:apply-templates select="charcreations"/>
 						<xsl:apply-templates select="disadvantages"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19186
          http://sourceforge.net/p/pcgen/code/19186
Author:   amaitland
Date:     2013-01-18 06:01:43 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
Preferred Usage is AC.x not BONUS.COMBAT.AC.x
Issue#: OS-223

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_FantasyGrounds2_pc_3.5.xml
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_generic_export.xml
    Trunk/pcgen/outputsheets/d20/fantasy/text/csheet_plain.TXT
    Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_modern_std.htm
    Trunk/pcgen/outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm
    Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetDeadlands.htm
    Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetSidewinder.htm
    Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/text/csheet_my_text_sheet.TXT

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2013-01-18 03:39:25 UTC (rev 19185)
+++ Trunk/pcgen/outputsheets/base.xml	2013-01-18 06:01:43 UTC (rev 19186)
@@ -282,7 +282,7 @@
 	  ====================================-->
 	<armor_class>
 		<total>|AC.Total|</total>
-		<listing>|BONUS.COMBAT.AC.LISTING|</listing>
+		<listing>|AC.LISTING|</listing>
 		<flat>|AC.Flatfooted|</flat>
 		<touch>|AC.Touch|</touch>
 		<base>|AC.Base|</base>
@@ -3236,7 +3236,7 @@
 			<name>|FOLLOWERTYPE.FAMILIAR.%companion.NAME|</name>
 			<race>|FOLLOWERTYPE.FAMILIAR.%companion.RACE|</race>
 			<hp>|FOLLOWERTYPE.FAMILIAR.%companion.HP|</hp>
-			<ac>|FOLLOWERTYPE.FAMILIAR.%companion.BONUS.COMBAT.AC.TOTAL|</ac>
+			<ac>|FOLLOWERTYPE.FAMILIAR.%companion.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.FAMILIAR.%companion.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.FAMILIAR.%companion.CHECK.REFLEX.TOTAL|</reflex>
 			<will>|FOLLOWERTYPE.FAMILIAR.%companion.CHECK.WILL.TOTAL|</will>
@@ -3291,7 +3291,7 @@
 			<name>|FOLLOWERTYPE.Psicrystal.%companion.NAME|</name>
 			<race>|FOLLOWERTYPE.Psicrystal.%companion.RACE|</race>
 			<hp>|FOLLOWERTYPE.Psicrystal.%companion.HP|</hp>
-			<ac>|FOLLOWERTYPE.Psicrystal.%companion.BONUS.COMBAT.AC.TOTAL|</ac>
+			<ac>|FOLLOWERTYPE.Psicrystal.%companion.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.Psicrystal.%companion.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.Psicrystal.%companion.CHECK.REFLEX.TOTAL|</reflex>
 			<will>|FOLLOWERTYPE.Psicrystal.%companion.CHECK.WILL.TOTAL|</will>
@@ -3350,7 +3350,7 @@
 			<name>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.NAME|</name>
 			<race>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.RACE|</race>
 			<hp>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.HP|</hp>
-			<ac>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.BONUS.COMBAT.AC.TOTAL|</ac>
+			<ac>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.CHECK.REFLEX.TOTAL|</reflex>
 			<will>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.CHECK.WILL.TOTAL|</will>
@@ -3405,7 +3405,7 @@
 			<name>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.NAME|</name>
 			<race>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.RACE|</race>
 			<hp>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.HP|</hp>
-			<ac>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.BONUS.COMBAT.AC.TOTAL|</ac>
+			<ac>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.CHECK.REFLEX.TOTAL|</reflex>
 			<will>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.CHECK.WILL.TOTAL|</will>
@@ -3459,7 +3459,7 @@
 			<name>|FOLLOWERTYPE.FOLLOWER.%companion.NAME|</name>
 			<race>|FOLLOWERTYPE.FOLLOWER.%companion.RACE|</race>
 			<hp>|FOLLOWERTYPE.FOLLOWER.%companion.HP|</hp>
-			<ac>|FOLLOWERTYPE.FOLLOWER.%companion.BONUS.COMBAT.AC.TOTAL|</ac>
+			<ac>|FOLLOWERTYPE.FOLLOWER.%companion.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.FOLLOWER.%companion.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.FOLLOWER.%companion.CHECK.REFLEX.TOTAL|</reflex>
 			<will>|FOLLOWERTYPE.FOLLOWER.%companion.CHECK.WILL.TOTAL|</will>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_FantasyGrounds2_pc_3.5.xml
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_FantasyGrounds2_pc_3.5.xml	2013-01-18 03:39:25 UTC (rev 19185)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_FantasyGrounds2_pc_3.5.xml	2013-01-18 06:01:43 UTC (rev 19186)
@@ -41,12 +41,12 @@
 		</abilities>
 		<ac>
 			<sources>
-				<armor type="number">|BONUS.COMBAT.AC.Armor|</armor>
-				<deflection type="number">|BONUS.COMBAT.AC.Deflection|</deflection>
-				<misc type="number">|BONUS.COMBAT.AC.TOTAL.!Base.!Armor.!Shield.!Size.!Deflection.!NaturalArmor.!NaturalArmorEnhancement.!Ability|</misc>
-				<naturalarmor type="number">|BONUS.COMBAT.AC.NaturalArmor.NaturalArmorEnhancement|</naturalarmor>
-				<shield type="number">|BONUS.COMBAT.AC.Shield|</shield>
-				<size type="number">|BONUS.COMBAT.AC.Size|</size>
+				<armor type="number">|AC.Armor|</armor>
+				<deflection type="number">|AC.Deflection|</deflection>
+				<misc type="number">|AC.TOTAL.!Base.!Armor.!Shield.!Size.!Deflection.!NaturalArmor.!NaturalArmorEnhancement.!Ability|</misc>
+				<naturalarmor type="number">|AC.NaturalArmor.NaturalArmorEnhancement|</naturalarmor>
+				<shield type="number">|AC.Shield|</shield>
+				<size type="number">|AC.Size|</size>
 				<temporary type="number">0</temporary>
 			</sources>
 		</ac>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_generic_export.xml
===================================================================
(Binary files differ)

Modified: Trunk/pcgen/outputsheets/d20/fantasy/text/csheet_plain.TXT
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/text/csheet_plain.TXT	2013-01-18 03:39:25 UTC (rev 19185)
+++ Trunk/pcgen/outputsheets/d20/fantasy/text/csheet_plain.TXT	2013-01-18 06:01:43 UTC (rev 19186)
@@ -53,7 +53,7 @@
 -------------------------- Combat --------------------------
 
     Total / Touch / Flat Footed
-AC: |BONUS.COMBAT.AC.TOTAL||FOR.1,((6-STRLEN[BONUS.COMBAT.AC.TOTAL])).INTVAL,6, ,NONE,NONE,1|/ |BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor||FOR.1,((6-STRLEN[BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor])).INTVAL,6, ,NONE,NONE,1|/ |BONUS.COMBAT.AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|
+AC: |AC.TOTAL||FOR.1,((6-STRLEN[AC.TOTAL])).INTVAL,6, ,NONE,NONE,1|/ |AC.TOTAL.!Armor.!NaturalArmor||FOR.1,((6-STRLEN[AC.TOTAL.!Armor.!NaturalArmor])).INTVAL,6, ,NONE,NONE,1|/ |AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|
 
 Initiative:   |INITIATIVEMOD.SIGN|
 BAB:          |ATTACK.MELEE|

Modified: Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_modern_std.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_modern_std.htm	2013-01-18 03:39:25 UTC (rev 19185)
+++ Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_modern_std.htm	2013-01-18 06:01:43 UTC (rev 19186)
@@ -223,24 +223,24 @@
 <table summary="formatting table">
 <tr>
 <td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>DEFENSE</b></font><font style="font-size:5pt" color="white"><br />&nbsp;</font></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL|</b></td>
+<td align="center" class="border9"><b>|AC.TOTAL|</b></td>
 <td align="center" class="font7"><b>:</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor.!EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|AC.TOTAL.!Armor.!NaturalArmor.!EQUIPMENT|</b></td>
 <td align="center" class="font7"><b>:</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|</b></td>
+<td align="center" class="border9"><b>|AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|</b></td>
 <td align="center" class="font7"><b>=</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.BASE|</b></td>
+<td align="center" class="border9"><b>|AC.BASE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.CLASSDEFENSE|</b></td>
+<td align="center" class="border9"><b>|AC.CLASSDEFENSE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
 
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|AC.EQUIPMENT|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Ability|</b></td>
+<td align="center" class="border9"><b>|AC.Ability|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.SIZE|</b></td>
+<td align="center" class="border9"><b>|AC.SIZE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor.!CLASSDEFENSE.!EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor.!CLASSDEFENSE.!EQUIPMENT|</b></td>
 <td align="center" width="5"></td>
 <td align="center" class="border9"><br /></td>
 <td align="center"></td>

Modified: Trunk/pcgen/outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm	2013-01-18 03:39:25 UTC (rev 19185)
+++ Trunk/pcgen/outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm	2013-01-18 06:01:43 UTC (rev 19186)
@@ -173,24 +173,24 @@
 <table summary="formatting table">
 <tr>
 <td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>DEFENSE</b></font><font style="font-size:5pt" color="white"><br />&nbsp;</font></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL|</b></td>
+<td align="center" class="border9"><b>|AC.TOTAL|</b></td>
 <td align="center" class="font7"><b>:</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|</b></td>
+<td align="center" class="border9"><b>|AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|</b></td>
 <td align="center" class="font7"><b>:</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor.!EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|AC.TOTAL.!Armor.!NaturalArmor.!EQUIPMENT|</b></td>
 <td align="center" class="font7"><b>=</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.BASE|</b></td>
+<td align="center" class="border9"><b>|AC.BASE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.CLASSDEFENSE|</b></td>
+<td align="center" class="border9"><b>|AC.CLASSDEFENSE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
 
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|AC.EQUIPMENT|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Ability|</b></td>
+<td align="center" class="border9"><b>|AC.Ability|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.SIZE|</b></td>
+<td align="center" class="border9"><b>|AC.SIZE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor.!CLASSDEFENSE.!EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor.!CLASSDEFENSE.!EQUIPMENT|</b></td>
 <td align="center" width="5"></td>
 <td align="center" class="border9"><br /></td>
 <td align="center"></td>

Modified: Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetDeadlands.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetDeadlands.htm	2013-01-18 03:39:25 UTC (rev 19185)
+++ Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetDeadlands.htm	2013-01-18 06:01:43 UTC (rev 19186)
@@ -212,23 +212,23 @@
 <tr>
 <td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>AC</b></font><font style="font-size:5pt" color="white"><br />Armour Class</font></td>
 <!-- Thomas Behr 13-02-02: replaced old tokens with new ones -->
-<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.TOTAL|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.TOTAL|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>:</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.TOTAL.!Ability.!PRESA:1,Uncanny Dodge.MIN=0|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.TOTAL.!Ability.!PRESA:1,Uncanny Dodge.MIN=0|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>:</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.TOTAL.!Armor.!NaturalArmor|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>=</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.BASE|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.BASE|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>+</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.Armor|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.Armor|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>+</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.Ability|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.Ability|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>+</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.SIZE|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.SIZE|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>+</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.NaturalArmor|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.NaturalArmor|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>+</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor|</b></font></td>
 <td align="center" width="5"><font style="font-size: 7pt"><b>
 </b></font></td>
 <td align="center" class="border"><font style="font-size: 9pt"><b><br /></b></font></td>

Modified: Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetSidewinder.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetSidewinder.htm	2013-01-18 03:39:25 UTC (rev 19185)
+++ Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetSidewinder.htm	2013-01-18 06:01:43 UTC (rev 19186)
@@ -172,24 +172,24 @@
 <table summary="formatting table">
 <tr>
 <td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>DEFENSE</b></font><font style="font-size:5pt" color="white"><br />&nbsp;</font></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL|</b></td>
+<td align="center" class="border9"><b>|AC.TOTAL|</b></td>
 <td align="center" class="font7"><b>:</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|</b></td>
+<td align="center" class="border9"><b>|AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|</b></td>
 <td align="center" class="font7"><b>:</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor.!EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|AC.TOTAL.!Armor.!NaturalArmor.!EQUIPMENT|</b></td>
 <td align="center" class="font7"><b>=</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.BASE|</b></td>
+<td align="center" class="border9"><b>|AC.BASE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.CLASSDEFENSE|</b></td>
+<td align="center" class="border9"><b>|AC.CLASSDEFENSE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
 
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|AC.EQUIPMENT|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Ability|</b></td>
+<td align="center" class="border9"><b>|AC.Ability|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.SIZE|</b></td>
+<td align="center" class="border9"><b>|AC.SIZE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor.!CLASSDEFENSE.!EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor.!CLASSDEFENSE.!EQUIPMENT|</b></td>
 <td align="center" width="5"></td>
 <td align="center" class="border9"><br /></td>
 <td align="center"></td>

Modified: Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/text/csheet_my_text_sheet.TXT
===================================================================
--- Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/text/csheet_my_text_sheet.TXT	2013-01-18 03:39:25 UTC (rev 19185)
+++ Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/text/csheet_my_text_sheet.TXT	2013-01-18 06:01:43 UTC (rev 19186)
@@ -53,7 +53,7 @@
 -------------------------- Combat --------------------------
 
     Total / Touch / Flat Footed
-AC: |BONUS.COMBAT.AC.TOTAL||FOR.1,((6-STRLEN[BONUS.COMBAT.AC.TOTAL])).INTVAL,6, ,NONE,NONE,1|/ |BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor||FOR.1,((6-STRLEN[BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor])).INTVAL,6, ,NONE,NONE,1|/ |BONUS.COMBAT.AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|
+AC: |AC.TOTAL||FOR.1,((6-STRLEN[AC.TOTAL])).INTVAL,6, ,NONE,NONE,1|/ |AC.TOTAL.!Armor.!NaturalArmor||FOR.1,((6-STRLEN[AC.TOTAL.!Armor.!NaturalArmor])).INTVAL,6, ,NONE,NONE,1|/ |AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|
 
 Initiative:   |INITIATIVEMOD.SIGN|
 BAB:          |ATTACK.MELEE|

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19231
          http://sourceforge.net/p/pcgen/code/19231
Author:   amaitland
Date:     2013-01-27 01:45:08 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
Back out Changes Tom specified. |AC. back to |BONUS.COMBAT.AC.

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_compact.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop_ws.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock1.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock2.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock3.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4a.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock5.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock_SRD.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_troubleshooting.htm
    Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_modern_std.htm
    Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm
    Trunk/pcgen/outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm
    Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetDeadlands.htm
    Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetSidewinder.htm
    Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm

Modified: Trunk/pcgen/outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm
===================================================================
--- Trunk/pcgen/outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -409,27 +409,27 @@
         <tr>
           <td width="90" class="ab"><b>AC</b>
             <br /><span class="ablable">&nbsp;Armour Class&nbsp;</span></td>
-          <td align="center" class="abb"><b>|AC.Total|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Total|</b></td>
           <td align="center" class="sign"><b>:</b></td>
-          <td align="center" class="abb"><b>|AC.Touch|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Touch|</b></td>
           <td align="center" class="sign"><b>:</b></td>
-          <td align="center" class="abb"><b>|AC.Flatfooted|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Flatfooted|</b></td>
           <td align="center" class="sign"><b>=</b></td>
-          <td align="center" class="abb"><b>|AC.Base|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Base|</b></td>
           <td align="center" class="sign"><b>+</b></td>
-          <td align="center" class="abb"><b>|AC.Armor|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Armor|</b></td>
 
           <td align="center" class="sign"><b>+</b></td>
-          <td align="center" class="abb"><b>|AC.Shield|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Shield|</b></td>
 
           <td align="center" class="sign"><b>+</b></td>
-          <td align="center" class="abb"><b>|AC.Ability|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Ability|</b></td>
           <td align="center" class="sign"><b>+</b></td>
-          <td align="center" class="abb"><b>|AC.Size|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Size|</b></td>
           <td align="center" class="sign"><b>+</b></td>
-          <td align="center" class="abb"><b>|AC.NaturalArmor|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.NaturalArmor|</b></td>
           <td align="center" class="sign"><b>+</b></td>
-          <td align="center" class="abb"><b>|AC.Misc|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Misc|</b></td>
           <td align="center" width="5"></td>
           <td align="center" class="abb"><br /></td>
           <td align="center"></td>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -305,7 +305,7 @@
 // Hits
 var HP = new HPObject( |HP| );
 // AC object
-var AC = new ACObject(|AC.Flatfooted|,|AC.Touch|,|AC.Total|,|AC.Base|,|AC.Armor|,|AC.Shield|,|AC.Ability|,|AC.Size|,|AC.NaturalArmor|,|AC.Deflection|,|AC.Dodge|,|AC.Misc|);
+var AC = new ACObject(|BONUS.COMBAT.AC.Flatfooted|,|BONUS.COMBAT.AC.Touch|,|BONUS.COMBAT.AC.Total|,|BONUS.COMBAT.AC.Base|,|BONUS.COMBAT.AC.Armor|,|BONUS.COMBAT.AC.Shield|,|BONUS.COMBAT.AC.Ability|,|BONUS.COMBAT.AC.Size|,|BONUS.COMBAT.AC.NaturalArmor|,|BONUS.COMBAT.AC.Deflection|,|BONUS.COMBAT.AC.Dodge|,|BONUS.COMBAT.AC.Misc|);
 // List of skills forbidden to a raging Barb
 var SkillsRedList = new Array("Alchemy","Appraise","Craft","Decipher Script","Diplomacy","Disable Device","Disguise","Escape Artist","Forgery","Gather Information","Handle Animal","Heal","Hide","Innuendo","Intuit Direction","Knowledge","Move Silently","Open Lock","Perform","Pick Pocket","Profession","Read Lips","Scry","Search","Sense Motive","Sleight of Hand","Spellcraft","Tumble","Use Magic Device");
 // List of the supported states a char can be in.

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_compact.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_compact.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_compact.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -249,29 +249,29 @@
 				<tr>
 					<td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>AC</b></font><font style="font-size:5pt" color="white"><br />Armour Class</font></td>
 					<!-- Thomas Behr 13-02-02: replaced old tokens with new ones -->
-					<td align="center" class="border9"><b>|AC.Total|</b></td>
+					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Total|</b></td>
 					<td align="center" class="font7"><b>:</b></td>
-					<td align="center" class="border9"><b>|AC.Touch|</b></td>
+					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Touch|</b></td>
 					<td align="center" class="font7"><b>:</b></td>
-					<td align="center" class="border9"><b>|AC.Flatfooted|</b></td>
+					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Flatfooted|</b></td>
 					<td align="center" class="font7"><b>=</b></td>
-					<td align="center" class="border9"><b>|AC.Base|</b></td>
+					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Base|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|AC.Armor|</b></td>
+					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Armor|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|AC.Shield|</b></td>
+					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Shield|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|AC.Ability|</b></td>
+					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Ability|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|AC.Size|</b></td>
+					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Size|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|AC.NaturalArmor|</b></td>
+					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.NaturalArmor|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|AC.Dodge|</b></td>
+					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Dodge|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|AC.Deflection|</b></td>
+					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Deflection|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|AC.Misc|</b></td>
+					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Misc|</b></td>
 					<td align="center" width="5"></td>
 					<td align="center" class="border9"><br /></td>
 					<td align="center"></td>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -386,7 +386,7 @@
 var HP = new HPObject( |HP| );
 var Subdual = new SubdualObject( '0' );
 // AC object
-var AC = new ACObject(|AC.Flatfooted|,|AC.Touch|,|AC.Total|,|AC.Base|,|AC.Armor|,|AC.Shield|,|AC.Ability|,|AC.Size|,|AC.NaturalArmor|,|AC.Deflection|,|AC.Dodge|,|AC.Misc|);
+var AC = new ACObject(|BONUS.COMBAT.AC.Flatfooted|,|BONUS.COMBAT.AC.Touch|,|BONUS.COMBAT.AC.Total|,|BONUS.COMBAT.AC.Base|,|BONUS.COMBAT.AC.Armor|,|BONUS.COMBAT.AC.Shield|,|BONUS.COMBAT.AC.Ability|,|BONUS.COMBAT.AC.Size|,|BONUS.COMBAT.AC.NaturalArmor|,|BONUS.COMBAT.AC.Deflection|,|BONUS.COMBAT.AC.Dodge|,|BONUS.COMBAT.AC.Misc|);
 // List of skills forbidden to a raging Barb
 var SkillsRedList = new Array("Alchemy","Appraise","Craft","Decipher Script","Diplomacy","Disable Device","Disguise","Escape Artist","Forgery","Gather Information","Handle Animal","Heal","Hide","Innuendo","Intuit Direction","Knowledge","Move Silently","Open Lock","Perform","Pick Pocket","Profession","Read Lips","Scry","Search","Sense Motive","Sleight of Hand","Spellcraft","Tumble","Use Magic Device");
 // List of the supported states a char can be in.

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop_ws.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop_ws.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop_ws.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -386,7 +386,7 @@
 var HP = new HPObject( |HP| );
 var Subdual = new SubdualObject( '0' );
 // AC object
-var AC = new ACObject(|AC.Flatfooted|,|AC.Touch|,|AC.Total|,|AC.Base|,|AC.Armor|,|AC.Shield|,|AC.Ability|,|AC.Size|,|AC.NaturalArmor|,|AC.Deflection|,|AC.Dodge|,|AC.Misc|);
+var AC = new ACObject(|BONUS.COMBAT.AC.Flatfooted|,|BONUS.COMBAT.AC.Touch|,|BONUS.COMBAT.AC.Total|,|BONUS.COMBAT.AC.Base|,|BONUS.COMBAT.AC.Armor|,|BONUS.COMBAT.AC.Shield|,|BONUS.COMBAT.AC.Ability|,|BONUS.COMBAT.AC.Size|,|BONUS.COMBAT.AC.NaturalArmor|,|BONUS.COMBAT.AC.Deflection|,|BONUS.COMBAT.AC.Dodge|,|BONUS.COMBAT.AC.Misc|);
 // List of skills forbidden to a raging Barb
 var SkillsRedList = new Array("Alchemy","Appraise","Craft","Decipher Script","Diplomacy","Disable Device","Disguise","Escape Artist","Forgery","Gather Information","Handle Animal","Heal","Hide","Innuendo","Intuit Direction","Knowledge","Move Silently","Open Lock","Perform","Pick Pocket","Profession","Read Lips","Scry","Search","Sense Motive","Sleight of Hand","Spellcraft","Tumble","Use Magic Device");
 // List of the supported states a char can be in.

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock1.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock1.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock1.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -74,7 +74,7 @@
   </tr>
   <tr valign="top">
     <td width="25%"><b>AC:</b></td>
-    <td width="75%">|AC.Total| (touch |AC.Touch|, flatfooted |AC.Flatfooted|)</td>
+    <td width="75%">|BONUS.COMBAT.AC.Total| (touch |BONUS.COMBAT.AC.Touch|, flatfooted |BONUS.COMBAT.AC.Flatfooted|)</td>
   </tr>
   <tr valign="top">
     <td width="25%"><b>Attacks:</b></td>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock2.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock2.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock2.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -65,8 +65,8 @@
 |ENDIF|
 Init |INITIATIVEMOD| 
 (|STAT.1.MOD| Dex, |INITIATIVEBONUS| Misc); Spd |MOVEMENT|; AC 
-|AC.Total| (flatfooted |AC.Flatfooted|, touch
-|AC.Touch|), 
+|BONUS.COMBAT.AC.Total| (flatfooted |BONUS.COMBAT.AC.Flatfooted|, touch
+|BONUS.COMBAT.AC.Touch|), 
 |FOR,%weap,0,COUNT[EQTYPE.WEAPON]-2,1,0|
 |IIF(WEAPON.%weap.BASEHIT:N/A)|
 |WEAPON.%weap.NAME| |WEAPON.%weap.THHIT| |WEAPON.%weap.TYPE| (|WEAPON.%weap.THDAMAGE| |WEAPON.%weap.CRIT|/x|WEAPON.%weap.MULT| |WEAPON.%weap.HAND| |WEAPON.%weap.SIZE| |WEAPON.%weap.SPROP| |WEAPON.%weap.NOTE|) or 

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock3.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock3.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock3.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -55,7 +55,7 @@
 vp |HP|; wp |ALTHP|;
 |ENDIF|
 Init |INITIATIVEMOD|;
-Spd |MOVEMENT|; AC |AC.Total|, touch |AC.Touch|, flat-footed |AC.Flatfooted|,
+Spd |MOVEMENT|; AC |BONUS.COMBAT.AC.Total|, touch |BONUS.COMBAT.AC.Touch|, flat-footed |BONUS.COMBAT.AC.Flatfooted|,
 Base Atk |ATTACK.MELEE|; 
 |IIF(VAR.UseCombatManueverBonus:1)|
 CMB |VAR.CMB.INTVAL.SIGN|; 

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -188,7 +188,7 @@
 <hr />
 
 |MANUALWHITESPACE|
-<b>AC</b>&nbsp;|AC.Total|,&nbsp;<b>touch</b>&nbsp;|AC.Touch|,&nbsp;<b>flat-footed</b>&nbsp;|AC.Flatfooted|
+<b>AC</b>&nbsp;|BONUS.COMBAT.AC.Total|,&nbsp;<b>touch</b>&nbsp;|BONUS.COMBAT.AC.Touch|,&nbsp;<b>flat-footed</b>&nbsp;|BONUS.COMBAT.AC.Flatfooted|
 
 <!-- ModifyAC TYPE Abilities -->
 |FOR,%ACfeats,0,count("ABILITIES","CATEGORY=Special Ability","TYPE=ModifyAC","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")-1,1,0|

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4a.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4a.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4a.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -462,7 +462,7 @@
 |MANUALWHITESPACE|
 |IIF(AC.Size:0)|
 |ELSE|
-&nbsp;&#x0020;&nbsp;&#x0020;(|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.Size.SIGN|</font>&#x0020;size
+&nbsp;&#x0020;&nbsp;&#x0020;(|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.Size.SIGN|</font>&#x0020;size
 |ENDIF|
 |IIF(AC.Ability:0)|
 |ELSE|
@@ -471,7 +471,7 @@
 |ELSE|
 ,&#x0020;
 |ENDIF|
-|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.Ability.SIGN|</font>&#x0020;Dex
+|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.Ability.SIGN|</font>&#x0020;Dex
 |ENDIF|
 |IIF(AC.NaturalArmor:0)|
 |ELSE|
@@ -480,7 +480,7 @@
 |ELSE|
 ,&#x0020;
 |ENDIF|
-|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.NaturalArmor.SIGN|</font>&#x0020;natural
+|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.NaturalArmor.SIGN|</font>&#x0020;natural
 |ENDIF|
 |IIF(AC.Deflection:0)|
 |ELSE|
@@ -489,7 +489,7 @@
 |ELSE|
 ,&#x0020;
 |ENDIF|
-|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.Deflection.SIGN|</font>&#x0020;deflection
+|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.Deflection.SIGN|</font>&#x0020;deflection
 |ENDIF|
 |IIF(AC.Misc:0)|
 |ELSE|
@@ -498,7 +498,7 @@
 |ELSE|
 ,&#x0020;
 |ENDIF|
-|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.Misc.SIGN|</font>&#x0020;misc
+|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.Misc.SIGN|</font>&#x0020;misc
 |ENDIF|
 
 |IIF(AC.Armor:0)|
@@ -508,14 +508,14 @@
 |ELSE|
 ,&#x0020;
 |ENDIF|
-|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.Armor.SIGN|&#x0020;</font>|EQ.IS.ARMOR.0.NAME|
+|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.Armor.SIGN|&#x0020;</font>|EQ.IS.ARMOR.0.NAME|
 |ENDIF|
 |IIF(AC.Shield:0)|
 |ELSE|
 |IIF(AC.Size:0.AND.AC.Ability:0.AND.AC.NaturalArmor:0.AND.AC.Misc:0.AND.AC.Armor:0)|
 &nbsp;&#x0020;&nbsp;&#x0020;(
 |ELSE|
-,&#x0020;|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.Shield.SIGN|</font>
+,&#x0020;|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.Shield.SIGN|</font>
 |ENDIF|
 |IIF(EQ.IS.SHIELD.0.TYPE:HEAVY)|
 &#x0020;Heavy&#x0020;Shield

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock5.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock5.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock5.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -158,32 +158,32 @@
 </table>
 
 |MANUALWHITESPACE|
-<b>AC</b>&nbsp;|AC.Total|,&nbsp;<b>touch</b>&nbsp;|AC.Touch|,&nbsp;<b>flat-footed</b>&nbsp;|AC.Flatfooted|
+<b>AC</b>&nbsp;|BONUS.COMBAT.AC.Total|,&nbsp;<b>touch</b>&nbsp;|BONUS.COMBAT.AC.Touch|,&nbsp;<b>flat-footed</b>&nbsp;|BONUS.COMBAT.AC.Flatfooted|
 
 &nbsp;(
 |IIF(AC.Size:0)|
 |ELSE|
-|AC.Size.SIGN|&nbsp;size,&nbsp;
+|BONUS.COMBAT.AC.Size.SIGN|&nbsp;size,&nbsp;
 |ENDIF|
 |IIF(AC.Ability:0)|
 |ELSE|
-|AC.Ability.SIGN|&nbsp;Dex,&nbsp;
+|BONUS.COMBAT.AC.Ability.SIGN|&nbsp;Dex,&nbsp;
 |ENDIF|
 |IIF(AC.NaturalArmor:0)|
 |ELSE|
-|AC.NaturalArmor.SIGN|&nbsp;natural,&nbsp;
+|BONUS.COMBAT.AC.NaturalArmor.SIGN|&nbsp;natural,&nbsp;
 |ENDIF|
 |IIF(AC.Dodge:0)|
 |ELSE|
-|AC.Dodge.SIGN|&nbsp;dodge,&nbsp;
+|BONUS.COMBAT.AC.Dodge.SIGN|&nbsp;dodge,&nbsp;
 |ENDIF|
 |IIF(AC.Deflection:0)|
 |ELSE|
-|AC.Deflection.SIGN|&nbsp;deflection,&nbsp;
+|BONUS.COMBAT.AC.Deflection.SIGN|&nbsp;deflection,&nbsp;
 |ENDIF|
 |IIF(AC.Misc:0)|
 |ELSE|
-|AC.Misc.SIGN|&nbsp;misc,&nbsp;
+|BONUS.COMBAT.AC.Misc.SIGN|&nbsp;misc,&nbsp;
 |ENDIF|
 |IIF(RACETYPE:Animal.OR.RACETYPE:Companion.OR.RACETYPE:Beast.OR.RACETYPE:Construct.OR.RACETYPE:Dragon.OR.RACETYPE:Magical Beast.OR.RACETYPE:Outsider.OR.RACETYPE:Shapechanger)|
 |IIF(TEXT.LENGTH.ARMOR.EQUIPPED.BARDING.0.NAME:0)|
@@ -206,7 +206,7 @@
 |ENDIF|
 |IIF(AC.Shield:0)|
 |ELSE|
-|AC.Shield.SIGN| 
+|BONUS.COMBAT.AC.Shield.SIGN| 
 |IIF(EQ.IS.SHIELD.0.TYPE:HEAVY)|
 &nbsp;Heavy&nbsp;Shield
 |ELSE|

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock_SRD.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock_SRD.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock_SRD.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -108,38 +108,38 @@
   </tr>
   <tr valign="top">
     <td width="25%"><b>Armor Class: </b></td>
-    <td width="75%">|AC.Total| (
+    <td width="75%">|BONUS.COMBAT.AC.Total| (
 |IIF(AC.Size:0)|
 |ELSE|
-|AC.Size.SIGN| size, 
+|BONUS.COMBAT.AC.Size.SIGN| size, 
 |ENDIF|
 |IIF(AC.Ability:0)|
 |ELSE|
-|AC.Ability.SIGN| Dex, 
+|BONUS.COMBAT.AC.Ability.SIGN| Dex, 
 |ENDIF|
 |IIF(AC.NaturalArmor:0)|
 |ELSE|
-|AC.NaturalArmor.SIGN| natural, 
+|BONUS.COMBAT.AC.NaturalArmor.SIGN| natural, 
 |ENDIF|
 |IIF(AC.Dodge:0)|
 |ELSE|
-|AC.Dodge.SIGN| dodge,
+|BONUS.COMBAT.AC.Dodge.SIGN| dodge,
 |ENDIF|
 |IIF(AC.Deflection:0)|
 |ELSE|
-|AC.Deflection.SIGN| deflection, 
+|BONUS.COMBAT.AC.Deflection.SIGN| deflection, 
 |ENDIF|
 |IIF(AC.Misc:0)|
 |ELSE|
-|AC.Misc.SIGN| misc
+|BONUS.COMBAT.AC.Misc.SIGN| misc
 |ENDIF|
 |IIF(AC.Armor:0)|
 |ELSE|
-|AC.Armor.SIGN| |EQ.IS.ARMOR.0.NAME|, 
+|BONUS.COMBAT.AC.Armor.SIGN| |EQ.IS.ARMOR.0.NAME|, 
 |ENDIF|
 |IIF(AC.Shield:0)|
 |ELSE|
-|AC.Shield.SIGN| 
+|BONUS.COMBAT.AC.Shield.SIGN| 
 |IIF(EQ.IS.SHIELD.0.TYPE:HEAVY)|
 Heavy Shield, 
 |ELSE|
@@ -157,7 +157,7 @@
 |ELSE|
 |ENDIF|
 |ENDIF|
-) touch |AC.Touch|, flatfooted |AC.Flatfooted|</td>
+) touch |BONUS.COMBAT.AC.Touch|, flatfooted |BONUS.COMBAT.AC.Flatfooted|</td>
   </tr>
 
 |IIF(VAR.UseCombatManueverBonus:1)|

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -257,31 +257,31 @@
         <tr>
           <td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>AC</b></font>
             <font style="font-size:5pt" color="white"><br />Armour Class</font></td>
-          <td align="center" class="border9"><b>|AC.Total|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Total|</b></td>
           <td align="center" class="font7"><b>:</b></td>
-          <td align="center" class="border9"><b>|AC.Flatfooted|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Flatfooted|</b></td>
           <td align="center" class="font7"><b>:</b></td>
-          <td align="center" class="border9"><b>|AC.Touch|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Touch|</b></td>
           <td align="center" class="font7"><b>=</b></td>
-          <td align="center" class="border9"><b>|AC.Base|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Base|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Armor|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Armor|</b></td>
 
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Shield|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Shield|</b></td>
 
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Ability|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Ability|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Size|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Size|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.NaturalArmor|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.NaturalArmor|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Dodge|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Dodge|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Deflection|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Deflection|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Misc|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Misc|</b></td>
           <td align="center" width="5"></td>
           <td align="center" class="border9"><br /></td>
           <td align="center"></td>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_troubleshooting.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_troubleshooting.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_troubleshooting.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -54,34 +54,34 @@
 
 <b>Initiative</b> |INITIATIVEMOD| = |STAT.1.MOD.SIGN|[STAT] |INITIATIVEBONUS.SIGN|[MISC]<br>
 
-<b>Armor Class</b> |AC.Total| = |AC.Base.SIGN|[BASE]
+<b>Armor Class</b> |BONUS.COMBAT.AC.Total| = |BONUS.COMBAT.AC.Base.SIGN|[BASE]
 |IIF(AC.Size:0)|
 |ELSE|
-|AC.Size.SIGN|[SIZE] 
+|BONUS.COMBAT.AC.Size.SIGN|[SIZE] 
 |ENDIF|
 |IIF(AC.Ability:0)|
 |ELSE|
-|AC.Ability.SIGN|[STAT] 
+|BONUS.COMBAT.AC.Ability.SIGN|[STAT] 
 |ENDIF|
 |IIF(AC.NaturalArmor:0)|
 |ELSE|
-|AC.NaturalArmor.SIGN|[NATURAL] 
+|BONUS.COMBAT.AC.NaturalArmor.SIGN|[NATURAL] 
 |ENDIF|
 |IIF(AC.Deflection:0)|
 |ELSE|
-|AC.Deflection.SIGN|[DEFLECTION] 
+|BONUS.COMBAT.AC.Deflection.SIGN|[DEFLECTION] 
 |ENDIF|
 |IIF(AC.Misc:0)|
 |ELSE|
-|AC.Misc.SIGN|[MISC]
+|BONUS.COMBAT.AC.Misc.SIGN|[MISC]
 |ENDIF|
 |IIF(AC.Armor:0)|
 |ELSE|
-|AC.Armor.SIGN| [|EQ.IS.ARMOR.0.NAME|], 
+|BONUS.COMBAT.AC.Armor.SIGN| [|EQ.IS.ARMOR.0.NAME|], 
 |ENDIF|
 |IIF(AC.Shield:0)|
 |ELSE|
-|AC.Shield.SIGN| 
+|BONUS.COMBAT.AC.Shield.SIGN| 
 |IIF(EQ.IS.SHIELD.0.TYPE:HEAVY)|
 [Heavy Shield] 
 |ELSE|

Modified: Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_modern_std.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_modern_std.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_modern_std.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -223,24 +223,24 @@
 <table summary="formatting table">
 <tr>
 <td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>DEFENSE</b></font><font style="font-size:5pt" color="white"><br />&nbsp;</font></td>
-<td align="center" class="border9"><b>|AC.TOTAL|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL|</b></td>
 <td align="center" class="font7"><b>:</b></td>
-<td align="center" class="border9"><b>|AC.TOTAL.!Armor.!NaturalArmor.!EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor.!EQUIPMENT|</b></td>
 <td align="center" class="font7"><b>:</b></td>
-<td align="center" class="border9"><b>|AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|</b></td>
 <td align="center" class="font7"><b>=</b></td>
-<td align="center" class="border9"><b>|AC.BASE|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.BASE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|AC.CLASSDEFENSE|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.CLASSDEFENSE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
 
-<td align="center" class="border9"><b>|AC.EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.EQUIPMENT|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|AC.Ability|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Ability|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|AC.SIZE|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.SIZE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor.!CLASSDEFENSE.!EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor.!CLASSDEFENSE.!EQUIPMENT|</b></td>
 <td align="center" width="5"></td>
 <td align="center" class="border9"><br /></td>
 <td align="center"></td>

Modified: Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -219,19 +219,19 @@
         </tr>
         <tr>
           <td class="ab" align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>DEFENSE</b></font></td>
-          <td align="center" class="abb"><b>|AC.Total|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Total|</b></td>
           <td align="center" width="29" class="font5"><br />
             =10+</td>
-          <td align="center" class="abb"><b>|AC.ClassDefense| / |AC.Armor|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.ClassDefense| / |BONUS.COMBAT.AC.Armor|</b></td>
           <td align="center" width="20" class="font5"><br />
             +</td>
           <td align="center" class="abb"><b>|STAT.1.MOD.INTVAL|</b></td>
           <td align="center" width="12" class="font5"><br />
             +</td>
-          <td align="center" class="abb"><b>|AC.Size|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Size|</b></td>
           <td align="center" width="14" class="font5"><br />
             +</td>
-          <td align="center" class="abb"><b>|AC.Misc|</b></td>
+          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Misc|</b></td>
         </tr>
         <tr>
           <td>&nbsp;</td>

Modified: Trunk/pcgen/outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -173,24 +173,24 @@
 <table summary="formatting table">
 <tr>
 <td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>DEFENSE</b></font><font style="font-size:5pt" color="white"><br />&nbsp;</font></td>
-<td align="center" class="border9"><b>|AC.TOTAL|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL|</b></td>
 <td align="center" class="font7"><b>:</b></td>
-<td align="center" class="border9"><b>|AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|</b></td>
 <td align="center" class="font7"><b>:</b></td>
-<td align="center" class="border9"><b>|AC.TOTAL.!Armor.!NaturalArmor.!EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor.!EQUIPMENT|</b></td>
 <td align="center" class="font7"><b>=</b></td>
-<td align="center" class="border9"><b>|AC.BASE|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.BASE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|AC.CLASSDEFENSE|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.CLASSDEFENSE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
 
-<td align="center" class="border9"><b>|AC.EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.EQUIPMENT|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|AC.Ability|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Ability|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|AC.SIZE|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.SIZE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor.!CLASSDEFENSE.!EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor.!CLASSDEFENSE.!EQUIPMENT|</b></td>
 <td align="center" width="5"></td>
 <td align="center" class="border9"><br /></td>
 <td align="center"></td>

Modified: Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetDeadlands.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetDeadlands.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetDeadlands.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -212,23 +212,23 @@
 <tr>
 <td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>AC</b></font><font style="font-size:5pt" color="white"><br />Armour Class</font></td>
 <!-- Thomas Behr 13-02-02: replaced old tokens with new ones -->
-<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.TOTAL|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.TOTAL|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>:</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.TOTAL.!Ability.!PRESA:1,Uncanny Dodge.MIN=0|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.TOTAL.!Ability.!PRESA:1,Uncanny Dodge.MIN=0|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>:</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.TOTAL.!Armor.!NaturalArmor|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>=</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.BASE|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.BASE|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>+</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.Armor|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.Armor|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>+</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.Ability|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.Ability|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>+</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.SIZE|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.SIZE|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>+</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.NaturalArmor|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.NaturalArmor|</b></font></td>
 <td align="center"><font style="font-size: 7pt"><b>+</b></font></td>
-<td align="center" class="border"><font style="font-size: 9pt"><b>|AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor|</b></font></td>
+<td align="center" class="border"><font style="font-size: 9pt"><b>|BONUS.COMBAT.AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor|</b></font></td>
 <td align="center" width="5"><font style="font-size: 7pt"><b>
 </b></font></td>
 <td align="center" class="border"><font style="font-size: 9pt"><b><br /></b></font></td>

Modified: Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetSidewinder.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetSidewinder.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/d20/western/htmlxml/csheetSidewinder.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -172,24 +172,24 @@
 <table summary="formatting table">
 <tr>
 <td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>DEFENSE</b></font><font style="font-size:5pt" color="white"><br />&nbsp;</font></td>
-<td align="center" class="border9"><b>|AC.TOTAL|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL|</b></td>
 <td align="center" class="font7"><b>:</b></td>
-<td align="center" class="border9"><b>|AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|</b></td>
 <td align="center" class="font7"><b>:</b></td>
-<td align="center" class="border9"><b>|AC.TOTAL.!Armor.!NaturalArmor.!EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor.!EQUIPMENT|</b></td>
 <td align="center" class="font7"><b>=</b></td>
-<td align="center" class="border9"><b>|AC.BASE|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.BASE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|AC.CLASSDEFENSE|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.CLASSDEFENSE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
 
-<td align="center" class="border9"><b>|AC.EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.EQUIPMENT|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|AC.Ability|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Ability|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|AC.SIZE|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.SIZE|</b></td>
 <td align="center" class="font7"><b>+</b></td>
-<td align="center" class="border9"><b>|AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor.!CLASSDEFENSE.!EQUIPMENT|</b></td>
+<td align="center" class="border9"><b>|BONUS.COMBAT.AC.TOTAL.!BASE.!Armor.!Ability.!SIZE.!NaturalArmor.!CLASSDEFENSE.!EQUIPMENT|</b></td>
 <td align="center" width="5"></td>
 <td align="center" class="border9"><br /></td>
 <td align="center"></td>

Modified: Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm
===================================================================
--- Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm	2013-01-27 01:40:42 UTC (rev 19230)
+++ Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm	2013-01-27 01:45:08 UTC (rev 19231)
@@ -253,29 +253,29 @@
         <tr>
           <td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>AC</b></font>
             <font style="font-size:5pt" color="white"><br />Armour Class</font></td>
-          <td align="center" class="border9"><b>|AC.Total|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Total|</b></td>
           <td align="center" class="font7"><b>:</b></td>
-          <td align="center" class="border9"><b>|AC.Flatfooted|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Flatfooted|</b></td>
           <td align="center" class="font7"><b>:</b></td>
-          <td align="center" class="border9"><b>|AC.Touch|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Touch|</b></td>
           <td align="center" class="font7"><b>=</b></td>
-          <td align="center" class="border9"><b>|AC.Base|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Base|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Armor|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Armor|</b></td>
 
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Shield|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Shield|</b></td>
 
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Ability|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Ability|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Size|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Size|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.NaturalArmor|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.NaturalArmor|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Deflection|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Deflection|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|AC.Misc|</b></td>
+          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Misc|</b></td>
           <td align="center" width="5"></td>
           <td align="center" class="border9"><br /></td>
           <td align="center"></td>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19329
          http://sourceforge.net/p/pcgen/code/19329
Author:   jdempsey
Date:     2013-02-04 11:49:01 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
Rollback all changes for 'Preferred Usage is AC.x not BONUS.COMBAT.AC.x'
* Revisions reverted are r19186, 19230,19231,19232
Issue#: OS-223

Revision Links:
--------------
    http://sourceforge.net/p/pcgen/code/19186

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_FantasyGrounds2_pc_3.5.xml
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_compact.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_generic_export.xml
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop_ws.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock1.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock2.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock3.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4a.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock5.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock_SRD.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm
    Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_troubleshooting.htm
    Trunk/pcgen/outputsheets/d20/fantasy/text/csheet_plain.TXT
    Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm
    Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm
    Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/text/csheet_my_text_sheet.TXT

Modified: Trunk/pcgen/outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm
===================================================================
--- Trunk/pcgen/outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -409,27 +409,27 @@
         <tr>
           <td width="90" class="ab"><b>AC</b>
             <br /><span class="ablable">&nbsp;Armour Class&nbsp;</span></td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Total|</b></td>
+          <td align="center" class="abb"><b>|AC.Total|</b></td>
           <td align="center" class="sign"><b>:</b></td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Touch|</b></td>
+          <td align="center" class="abb"><b>|AC.Touch|</b></td>
           <td align="center" class="sign"><b>:</b></td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Flatfooted|</b></td>
+          <td align="center" class="abb"><b>|AC.Flatfooted|</b></td>
           <td align="center" class="sign"><b>=</b></td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Base|</b></td>
+          <td align="center" class="abb"><b>|AC.Base|</b></td>
           <td align="center" class="sign"><b>+</b></td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Armor|</b></td>
+          <td align="center" class="abb"><b>|AC.Armor|</b></td>
 
           <td align="center" class="sign"><b>+</b></td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Shield|</b></td>
+          <td align="center" class="abb"><b>|AC.Shield|</b></td>
 
           <td align="center" class="sign"><b>+</b></td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Ability|</b></td>
+          <td align="center" class="abb"><b>|AC.Ability|</b></td>
           <td align="center" class="sign"><b>+</b></td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Size|</b></td>
+          <td align="center" class="abb"><b>|AC.Size|</b></td>
           <td align="center" class="sign"><b>+</b></td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.NaturalArmor|</b></td>
+          <td align="center" class="abb"><b>|AC.NaturalArmor|</b></td>
           <td align="center" class="sign"><b>+</b></td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Misc|</b></td>
+          <td align="center" class="abb"><b>|AC.Misc|</b></td>
           <td align="center" width="5"></td>
           <td align="center" class="abb"><br /></td>
           <td align="center"></td>

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/base.xml	2013-02-04 11:49:01 UTC (rev 19329)
@@ -140,12 +140,9 @@
 		<interests>|INTERESTS|</interests>
 		<languages>
 |FOR,%lang,0,COUNT[LANGUAGES]-1,1,0|
-			<language>|LANGUAGES.%lang||ABILITYALL.Special Ability.%ability.TYPE=Language.ASPECT.Languages|</language>
+			<language>|LANGUAGES.%lang|</language>
 |ENDFOR|
 			<all>|LANGUAGES|</all>
-			<skillbonus>
-					<description></description>
-				</skillbonus>
 		</languages>
 		<location>|LOCATION|</location>
 		<move>
@@ -307,6 +304,7 @@
 		<sacred>|AC.Sacred|</sacred>
 		<profane>|AC.Profane|</profane>
 
+
 		<miss_chance/>
 		<max_dex>|MAXDEX|</max_dex>
 		<spell_failure>|SPELLFAILURE|</spell_failure>
@@ -3238,7 +3236,7 @@
 			<name>|FOLLOWERTYPE.FAMILIAR.%companion.NAME|</name>
 			<race>|FOLLOWERTYPE.FAMILIAR.%companion.RACE|</race>
 			<hp>|FOLLOWERTYPE.FAMILIAR.%companion.HP|</hp>
-			<ac>|FOLLOWERTYPE.FAMILIAR.%companion.AC.TOTAL|</ac>
+			<ac>|FOLLOWERTYPE.FAMILIAR.%companion.BONUS.COMBAT.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.FAMILIAR.%companion.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.FAMILIAR.%companion.CHECK.REFLEX.TOTAL|</reflex>
 			<will>|FOLLOWERTYPE.FAMILIAR.%companion.CHECK.WILL.TOTAL|</will>
@@ -3293,7 +3291,7 @@
 			<name>|FOLLOWERTYPE.Psicrystal.%companion.NAME|</name>
 			<race>|FOLLOWERTYPE.Psicrystal.%companion.RACE|</race>
 			<hp>|FOLLOWERTYPE.Psicrystal.%companion.HP|</hp>
-			<ac>|FOLLOWERTYPE.Psicrystal.%companion.AC.TOTAL|</ac>
+			<ac>|FOLLOWERTYPE.Psicrystal.%companion.BONUS.COMBAT.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.Psicrystal.%companion.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.Psicrystal.%companion.CHECK.REFLEX.TOTAL|</reflex>
 			<will>|FOLLOWERTYPE.Psicrystal.%companion.CHECK.WILL.TOTAL|</will>
@@ -3352,7 +3350,7 @@
 			<name>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.NAME|</name>
 			<race>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.RACE|</race>
 			<hp>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.HP|</hp>
-			<ac>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.AC.TOTAL|</ac>
+			<ac>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.BONUS.COMBAT.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.CHECK.REFLEX.TOTAL|</reflex>
 			<will>|FOLLOWERTYPE.SPECIAL MOUNT.%companion.CHECK.WILL.TOTAL|</will>
@@ -3407,7 +3405,7 @@
 			<name>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.NAME|</name>
 			<race>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.RACE|</race>
 			<hp>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.HP|</hp>
-			<ac>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.AC.TOTAL|</ac>
+			<ac>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.BONUS.COMBAT.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.CHECK.REFLEX.TOTAL|</reflex>
 			<will>|FOLLOWERTYPE.ANIMAL COMPANION.%companion.CHECK.WILL.TOTAL|</will>
@@ -3461,7 +3459,7 @@
 			<name>|FOLLOWERTYPE.FOLLOWER.%companion.NAME|</name>
 			<race>|FOLLOWERTYPE.FOLLOWER.%companion.RACE|</race>
 			<hp>|FOLLOWERTYPE.FOLLOWER.%companion.HP|</hp>
-			<ac>|FOLLOWERTYPE.FOLLOWER.%companion.AC.TOTAL|</ac>
+			<ac>|FOLLOWERTYPE.FOLLOWER.%companion.BONUS.COMBAT.AC.TOTAL|</ac>
 			<fortitude>|FOLLOWERTYPE.FOLLOWER.%companion.CHECK.FORTITUDE.TOTAL|</fortitude>
 			<reflex>|FOLLOWERTYPE.FOLLOWER.%companion.CHECK.REFLEX.TOTAL|</reflex>
 			<will>|FOLLOWERTYPE.FOLLOWER.%companion.CHECK.WILL.TOTAL|</will>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_FantasyGrounds2_pc_3.5.xml
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_FantasyGrounds2_pc_3.5.xml	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_FantasyGrounds2_pc_3.5.xml	2013-02-04 11:49:01 UTC (rev 19329)
@@ -41,12 +41,12 @@
 		</abilities>
 		<ac>
 			<sources>
-				<armor type="number">|AC.Armor|</armor>
-				<deflection type="number">|AC.Deflection|</deflection>
-				<misc type="number">|AC.TOTAL.!Base.!Armor.!Shield.!Size.!Deflection.!NaturalArmor.!NaturalArmorEnhancement.!Ability|</misc>
-				<naturalarmor type="number">|AC.NaturalArmor.NaturalArmorEnhancement|</naturalarmor>
-				<shield type="number">|AC.Shield|</shield>
-				<size type="number">|AC.Size|</size>
+				<armor type="number">|BONUS.COMBAT.AC.Armor|</armor>
+				<deflection type="number">|BONUS.COMBAT.AC.Deflection|</deflection>
+				<misc type="number">|BONUS.COMBAT.AC.TOTAL.!Base.!Armor.!Shield.!Size.!Deflection.!NaturalArmor.!NaturalArmorEnhancement.!Ability|</misc>
+				<naturalarmor type="number">|BONUS.COMBAT.AC.NaturalArmor.NaturalArmorEnhancement|</naturalarmor>
+				<shield type="number">|BONUS.COMBAT.AC.Shield|</shield>
+				<size type="number">|BONUS.COMBAT.AC.Size|</size>
 				<temporary type="number">0</temporary>
 			</sources>
 		</ac>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_combined.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -305,7 +305,7 @@
 // Hits
 var HP = new HPObject( |HP| );
 // AC object
-var AC = new ACObject(|BONUS.COMBAT.AC.Flatfooted|,|BONUS.COMBAT.AC.Touch|,|BONUS.COMBAT.AC.Total|,|BONUS.COMBAT.AC.Base|,|BONUS.COMBAT.AC.Armor|,|BONUS.COMBAT.AC.Shield|,|BONUS.COMBAT.AC.Ability|,|BONUS.COMBAT.AC.Size|,|BONUS.COMBAT.AC.NaturalArmor|,|BONUS.COMBAT.AC.Deflection|,|BONUS.COMBAT.AC.Dodge|,|BONUS.COMBAT.AC.Misc|);
+var AC = new ACObject(|AC.Flatfooted|,|AC.Touch|,|AC.Total|,|AC.Base|,|AC.Armor|,|AC.Shield|,|AC.Ability|,|AC.Size|,|AC.NaturalArmor|,|AC.Deflection|,|AC.Dodge|,|AC.Misc|);
 // List of skills forbidden to a raging Barb
 var SkillsRedList = new Array("Alchemy","Appraise","Craft","Decipher Script","Diplomacy","Disable Device","Disguise","Escape Artist","Forgery","Gather Information","Handle Animal","Heal","Hide","Innuendo","Intuit Direction","Knowledge","Move Silently","Open Lock","Perform","Pick Pocket","Profession","Read Lips","Scry","Search","Sense Motive","Sleight of Hand","Spellcraft","Tumble","Use Magic Device");
 // List of the supported states a char can be in.

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_compact.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_compact.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_compact.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -249,29 +249,29 @@
 				<tr>
 					<td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>AC</b></font><font style="font-size:5pt" color="white"><br />Armour Class</font></td>
 					<!-- Thomas Behr 13-02-02: replaced old tokens with new ones -->
-					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Total|</b></td>
+					<td align="center" class="border9"><b>|AC.Total|</b></td>
 					<td align="center" class="font7"><b>:</b></td>
-					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Touch|</b></td>
+					<td align="center" class="border9"><b>|AC.Touch|</b></td>
 					<td align="center" class="font7"><b>:</b></td>
-					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Flatfooted|</b></td>
+					<td align="center" class="border9"><b>|AC.Flatfooted|</b></td>
 					<td align="center" class="font7"><b>=</b></td>
-					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Base|</b></td>
+					<td align="center" class="border9"><b>|AC.Base|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Armor|</b></td>
+					<td align="center" class="border9"><b>|AC.Armor|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Shield|</b></td>
+					<td align="center" class="border9"><b>|AC.Shield|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Ability|</b></td>
+					<td align="center" class="border9"><b>|AC.Ability|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Size|</b></td>
+					<td align="center" class="border9"><b>|AC.Size|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.NaturalArmor|</b></td>
+					<td align="center" class="border9"><b>|AC.NaturalArmor|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Dodge|</b></td>
+					<td align="center" class="border9"><b>|AC.Dodge|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Deflection|</b></td>
+					<td align="center" class="border9"><b>|AC.Deflection|</b></td>
 					<td align="center" class="font7"><b>+</b></td>
-					<td align="center" class="border9"><b>|BONUS.COMBAT.AC.Misc|</b></td>
+					<td align="center" class="border9"><b>|AC.Misc|</b></td>
 					<td align="center" width="5"></td>
 					<td align="center" class="border9"><br /></td>
 					<td align="center"></td>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_generic_export.xml
===================================================================
(Binary files differ)

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -386,7 +386,7 @@
 var HP = new HPObject( |HP| );
 var Subdual = new SubdualObject( '0' );
 // AC object
-var AC = new ACObject(|BONUS.COMBAT.AC.Flatfooted|,|BONUS.COMBAT.AC.Touch|,|BONUS.COMBAT.AC.Total|,|BONUS.COMBAT.AC.Base|,|BONUS.COMBAT.AC.Armor|,|BONUS.COMBAT.AC.Shield|,|BONUS.COMBAT.AC.Ability|,|BONUS.COMBAT.AC.Size|,|BONUS.COMBAT.AC.NaturalArmor|,|BONUS.COMBAT.AC.Deflection|,|BONUS.COMBAT.AC.Dodge|,|BONUS.COMBAT.AC.Misc|);
+var AC = new ACObject(|AC.Flatfooted|,|AC.Touch|,|AC.Total|,|AC.Base|,|AC.Armor|,|AC.Shield|,|AC.Ability|,|AC.Size|,|AC.NaturalArmor|,|AC.Deflection|,|AC.Dodge|,|AC.Misc|);
 // List of skills forbidden to a raging Barb
 var SkillsRedList = new Array("Alchemy","Appraise","Craft","Decipher Script","Diplomacy","Disable Device","Disguise","Escape Artist","Forgery","Gather Information","Handle Animal","Heal","Hide","Innuendo","Intuit Direction","Knowledge","Move Silently","Open Lock","Perform","Pick Pocket","Profession","Read Lips","Scry","Search","Sense Motive","Sleight of Hand","Spellcraft","Tumble","Use Magic Device");
 // List of the supported states a char can be in.

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop_ws.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop_ws.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_laptop_ws.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -386,7 +386,7 @@
 var HP = new HPObject( |HP| );
 var Subdual = new SubdualObject( '0' );
 // AC object
-var AC = new ACObject(|BONUS.COMBAT.AC.Flatfooted|,|BONUS.COMBAT.AC.Touch|,|BONUS.COMBAT.AC.Total|,|BONUS.COMBAT.AC.Base|,|BONUS.COMBAT.AC.Armor|,|BONUS.COMBAT.AC.Shield|,|BONUS.COMBAT.AC.Ability|,|BONUS.COMBAT.AC.Size|,|BONUS.COMBAT.AC.NaturalArmor|,|BONUS.COMBAT.AC.Deflection|,|BONUS.COMBAT.AC.Dodge|,|BONUS.COMBAT.AC.Misc|);
+var AC = new ACObject(|AC.Flatfooted|,|AC.Touch|,|AC.Total|,|AC.Base|,|AC.Armor|,|AC.Shield|,|AC.Ability|,|AC.Size|,|AC.NaturalArmor|,|AC.Deflection|,|AC.Dodge|,|AC.Misc|);
 // List of skills forbidden to a raging Barb
 var SkillsRedList = new Array("Alchemy","Appraise","Craft","Decipher Script","Diplomacy","Disable Device","Disguise","Escape Artist","Forgery","Gather Information","Handle Animal","Heal","Hide","Innuendo","Intuit Direction","Knowledge","Move Silently","Open Lock","Perform","Pick Pocket","Profession","Read Lips","Scry","Search","Sense Motive","Sleight of Hand","Spellcraft","Tumble","Use Magic Device");
 // List of the supported states a char can be in.

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock1.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock1.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock1.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -74,7 +74,7 @@
   </tr>
   <tr valign="top">
     <td width="25%"><b>AC:</b></td>
-    <td width="75%">|BONUS.COMBAT.AC.Total| (touch |BONUS.COMBAT.AC.Touch|, flatfooted |BONUS.COMBAT.AC.Flatfooted|)</td>
+    <td width="75%">|AC.Total| (touch |AC.Touch|, flatfooted |AC.Flatfooted|)</td>
   </tr>
   <tr valign="top">
     <td width="25%"><b>Attacks:</b></td>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock2.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock2.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock2.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -65,8 +65,8 @@
 |ENDIF|
 Init |INITIATIVEMOD| 
 (|STAT.1.MOD| Dex, |INITIATIVEBONUS| Misc); Spd |MOVEMENT|; AC 
-|BONUS.COMBAT.AC.Total| (flatfooted |BONUS.COMBAT.AC.Flatfooted|, touch
-|BONUS.COMBAT.AC.Touch|), 
+|AC.Total| (flatfooted |AC.Flatfooted|, touch
+|AC.Touch|), 
 |FOR,%weap,0,COUNT[EQTYPE.WEAPON]-2,1,0|
 |IIF(WEAPON.%weap.BASEHIT:N/A)|
 |WEAPON.%weap.NAME| |WEAPON.%weap.THHIT| |WEAPON.%weap.TYPE| (|WEAPON.%weap.THDAMAGE| |WEAPON.%weap.CRIT|/x|WEAPON.%weap.MULT| |WEAPON.%weap.HAND| |WEAPON.%weap.SIZE| |WEAPON.%weap.SPROP| |WEAPON.%weap.NOTE|) or 

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock3.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock3.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock3.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -55,7 +55,7 @@
 vp |HP|; wp |ALTHP|;
 |ENDIF|
 Init |INITIATIVEMOD|;
-Spd |MOVEMENT|; AC |BONUS.COMBAT.AC.Total|, touch |BONUS.COMBAT.AC.Touch|, flat-footed |BONUS.COMBAT.AC.Flatfooted|,
+Spd |MOVEMENT|; AC |AC.Total|, touch |AC.Touch|, flat-footed |AC.Flatfooted|,
 Base Atk |ATTACK.MELEE|; 
 |IIF(VAR.UseCombatManueverBonus:1)|
 CMB |VAR.CMB.INTVAL.SIGN|; 

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -188,7 +188,7 @@
 <hr />
 
 |MANUALWHITESPACE|
-<b>AC</b>&nbsp;|BONUS.COMBAT.AC.Total|,&nbsp;<b>touch</b>&nbsp;|BONUS.COMBAT.AC.Touch|,&nbsp;<b>flat-footed</b>&nbsp;|BONUS.COMBAT.AC.Flatfooted|
+<b>AC</b>&nbsp;|AC.Total|,&nbsp;<b>touch</b>&nbsp;|AC.Touch|,&nbsp;<b>flat-footed</b>&nbsp;|AC.Flatfooted|
 
 <!-- ModifyAC TYPE Abilities -->
 |FOR,%ACfeats,0,count("ABILITIES","CATEGORY=Special Ability","TYPE=ModifyAC","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")-1,1,0|

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4a.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4a.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4a.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -462,7 +462,7 @@
 |MANUALWHITESPACE|
 |IIF(AC.Size:0)|
 |ELSE|
-&nbsp;&#x0020;&nbsp;&#x0020;(|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.Size.SIGN|</font>&#x0020;size
+&nbsp;&#x0020;&nbsp;&#x0020;(|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.Size.SIGN|</font>&#x0020;size
 |ENDIF|
 |IIF(AC.Ability:0)|
 |ELSE|
@@ -471,7 +471,7 @@
 |ELSE|
 ,&#x0020;
 |ENDIF|
-|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.Ability.SIGN|</font>&#x0020;Dex
+|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.Ability.SIGN|</font>&#x0020;Dex
 |ENDIF|
 |IIF(AC.NaturalArmor:0)|
 |ELSE|
@@ -480,7 +480,7 @@
 |ELSE|
 ,&#x0020;
 |ENDIF|
-|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.NaturalArmor.SIGN|</font>&#x0020;natural
+|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.NaturalArmor.SIGN|</font>&#x0020;natural
 |ENDIF|
 |IIF(AC.Deflection:0)|
 |ELSE|
@@ -489,7 +489,7 @@
 |ELSE|
 ,&#x0020;
 |ENDIF|
-|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.Deflection.SIGN|</font>&#x0020;deflection
+|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.Deflection.SIGN|</font>&#x0020;deflection
 |ENDIF|
 |IIF(AC.Misc:0)|
 |ELSE|
@@ -498,7 +498,7 @@
 |ELSE|
 ,&#x0020;
 |ENDIF|
-|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.Misc.SIGN|</font>&#x0020;misc
+|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.Misc.SIGN|</font>&#x0020;misc
 |ENDIF|
 
 |IIF(AC.Armor:0)|
@@ -508,14 +508,14 @@
 |ELSE|
 ,&#x0020;
 |ENDIF|
-|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.Armor.SIGN|&#x0020;</font>|EQ.IS.ARMOR.0.NAME|
+|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.Armor.SIGN|&#x0020;</font>|EQ.IS.ARMOR.0.NAME|
 |ENDIF|
 |IIF(AC.Shield:0)|
 |ELSE|
 |IIF(AC.Size:0.AND.AC.Ability:0.AND.AC.NaturalArmor:0.AND.AC.Misc:0.AND.AC.Armor:0)|
 &nbsp;&#x0020;&nbsp;&#x0020;(
 |ELSE|
-,&#x0020;|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||BONUS.COMBAT.AC.Shield.SIGN|</font>
+,&#x0020;|ENDMANUALWHITESPACE|<font face="ScalaSans Caps">|MANUALWHITESPACE||AC.Shield.SIGN|</font>
 |ENDIF|
 |IIF(EQ.IS.SHIELD.0.TYPE:HEAVY)|
 &#x0020;Heavy&#x0020;Shield

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock5.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock5.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock5.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -158,32 +158,32 @@
 </table>
 
 |MANUALWHITESPACE|
-<b>AC</b>&nbsp;|BONUS.COMBAT.AC.Total|,&nbsp;<b>touch</b>&nbsp;|BONUS.COMBAT.AC.Touch|,&nbsp;<b>flat-footed</b>&nbsp;|BONUS.COMBAT.AC.Flatfooted|
+<b>AC</b>&nbsp;|AC.Total|,&nbsp;<b>touch</b>&nbsp;|AC.Touch|,&nbsp;<b>flat-footed</b>&nbsp;|AC.Flatfooted|
 
 &nbsp;(
 |IIF(AC.Size:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Size.SIGN|&nbsp;size,&nbsp;
+|AC.Size.SIGN|&nbsp;size,&nbsp;
 |ENDIF|
 |IIF(AC.Ability:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Ability.SIGN|&nbsp;Dex,&nbsp;
+|AC.Ability.SIGN|&nbsp;Dex,&nbsp;
 |ENDIF|
 |IIF(AC.NaturalArmor:0)|
 |ELSE|
-|BONUS.COMBAT.AC.NaturalArmor.SIGN|&nbsp;natural,&nbsp;
+|AC.NaturalArmor.SIGN|&nbsp;natural,&nbsp;
 |ENDIF|
 |IIF(AC.Dodge:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Dodge.SIGN|&nbsp;dodge,&nbsp;
+|AC.Dodge.SIGN|&nbsp;dodge,&nbsp;
 |ENDIF|
 |IIF(AC.Deflection:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Deflection.SIGN|&nbsp;deflection,&nbsp;
+|AC.Deflection.SIGN|&nbsp;deflection,&nbsp;
 |ENDIF|
 |IIF(AC.Misc:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Misc.SIGN|&nbsp;misc,&nbsp;
+|AC.Misc.SIGN|&nbsp;misc,&nbsp;
 |ENDIF|
 |IIF(RACETYPE:Animal.OR.RACETYPE:Companion.OR.RACETYPE:Beast.OR.RACETYPE:Construct.OR.RACETYPE:Dragon.OR.RACETYPE:Magical Beast.OR.RACETYPE:Outsider.OR.RACETYPE:Shapechanger)|
 |IIF(TEXT.LENGTH.ARMOR.EQUIPPED.BARDING.0.NAME:0)|
@@ -206,7 +206,7 @@
 |ENDIF|
 |IIF(AC.Shield:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Shield.SIGN| 
+|AC.Shield.SIGN| 
 |IIF(EQ.IS.SHIELD.0.TYPE:HEAVY)|
 &nbsp;Heavy&nbsp;Shield
 |ELSE|

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock_SRD.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock_SRD.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock_SRD.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -108,38 +108,38 @@
   </tr>
   <tr valign="top">
     <td width="25%"><b>Armor Class: </b></td>
-    <td width="75%">|BONUS.COMBAT.AC.Total| (
+    <td width="75%">|AC.Total| (
 |IIF(AC.Size:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Size.SIGN| size, 
+|AC.Size.SIGN| size, 
 |ENDIF|
 |IIF(AC.Ability:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Ability.SIGN| Dex, 
+|AC.Ability.SIGN| Dex, 
 |ENDIF|
 |IIF(AC.NaturalArmor:0)|
 |ELSE|
-|BONUS.COMBAT.AC.NaturalArmor.SIGN| natural, 
+|AC.NaturalArmor.SIGN| natural, 
 |ENDIF|
 |IIF(AC.Dodge:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Dodge.SIGN| dodge,
+|AC.Dodge.SIGN| dodge,
 |ENDIF|
 |IIF(AC.Deflection:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Deflection.SIGN| deflection, 
+|AC.Deflection.SIGN| deflection, 
 |ENDIF|
 |IIF(AC.Misc:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Misc.SIGN| misc
+|AC.Misc.SIGN| misc
 |ENDIF|
 |IIF(AC.Armor:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Armor.SIGN| |EQ.IS.ARMOR.0.NAME|, 
+|AC.Armor.SIGN| |EQ.IS.ARMOR.0.NAME|, 
 |ENDIF|
 |IIF(AC.Shield:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Shield.SIGN| 
+|AC.Shield.SIGN| 
 |IIF(EQ.IS.SHIELD.0.TYPE:HEAVY)|
 Heavy Shield, 
 |ELSE|
@@ -157,7 +157,7 @@
 |ELSE|
 |ENDIF|
 |ENDIF|
-) touch |BONUS.COMBAT.AC.Touch|, flatfooted |BONUS.COMBAT.AC.Flatfooted|</td>
+) touch |AC.Touch|, flatfooted |AC.Flatfooted|</td>
   </tr>
 
 |IIF(VAR.UseCombatManueverBonus:1)|

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -257,31 +257,31 @@
         <tr>
           <td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>AC</b></font>
             <font style="font-size:5pt" color="white"><br />Armour Class</font></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Total|</b></td>
+          <td align="center" class="border9"><b>|AC.Total|</b></td>
           <td align="center" class="font7"><b>:</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Flatfooted|</b></td>
+          <td align="center" class="border9"><b>|AC.Flatfooted|</b></td>
           <td align="center" class="font7"><b>:</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Touch|</b></td>
+          <td align="center" class="border9"><b>|AC.Touch|</b></td>
           <td align="center" class="font7"><b>=</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Base|</b></td>
+          <td align="center" class="border9"><b>|AC.Base|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Armor|</b></td>
+          <td align="center" class="border9"><b>|AC.Armor|</b></td>
 
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Shield|</b></td>
+          <td align="center" class="border9"><b>|AC.Shield|</b></td>
 
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Ability|</b></td>
+          <td align="center" class="border9"><b>|AC.Ability|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Size|</b></td>
+          <td align="center" class="border9"><b>|AC.Size|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.NaturalArmor|</b></td>
+          <td align="center" class="border9"><b>|AC.NaturalArmor|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Dodge|</b></td>
+          <td align="center" class="border9"><b>|AC.Dodge|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Deflection|</b></td>
+          <td align="center" class="border9"><b>|AC.Deflection|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Misc|</b></td>
+          <td align="center" class="border9"><b>|AC.Misc|</b></td>
           <td align="center" width="5"></td>
           <td align="center" class="border9"><br /></td>
           <td align="center"></td>

Modified: Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_troubleshooting.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_troubleshooting.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/htmlxml/csheet_fantasy_troubleshooting.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -54,34 +54,34 @@
 
 <b>Initiative</b> |INITIATIVEMOD| = |STAT.1.MOD.SIGN|[STAT] |INITIATIVEBONUS.SIGN|[MISC]<br>
 
-<b>Armor Class</b> |BONUS.COMBAT.AC.Total| = |BONUS.COMBAT.AC.Base.SIGN|[BASE]
+<b>Armor Class</b> |AC.Total| = |AC.Base.SIGN|[BASE]
 |IIF(AC.Size:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Size.SIGN|[SIZE] 
+|AC.Size.SIGN|[SIZE] 
 |ENDIF|
 |IIF(AC.Ability:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Ability.SIGN|[STAT] 
+|AC.Ability.SIGN|[STAT] 
 |ENDIF|
 |IIF(AC.NaturalArmor:0)|
 |ELSE|
-|BONUS.COMBAT.AC.NaturalArmor.SIGN|[NATURAL] 
+|AC.NaturalArmor.SIGN|[NATURAL] 
 |ENDIF|
 |IIF(AC.Deflection:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Deflection.SIGN|[DEFLECTION] 
+|AC.Deflection.SIGN|[DEFLECTION] 
 |ENDIF|
 |IIF(AC.Misc:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Misc.SIGN|[MISC]
+|AC.Misc.SIGN|[MISC]
 |ENDIF|
 |IIF(AC.Armor:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Armor.SIGN| [|EQ.IS.ARMOR.0.NAME|], 
+|AC.Armor.SIGN| [|EQ.IS.ARMOR.0.NAME|], 
 |ENDIF|
 |IIF(AC.Shield:0)|
 |ELSE|
-|BONUS.COMBAT.AC.Shield.SIGN| 
+|AC.Shield.SIGN| 
 |IIF(EQ.IS.SHIELD.0.TYPE:HEAVY)|
 [Heavy Shield] 
 |ELSE|

Modified: Trunk/pcgen/outputsheets/d20/fantasy/text/csheet_plain.TXT
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/text/csheet_plain.TXT	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/fantasy/text/csheet_plain.TXT	2013-02-04 11:49:01 UTC (rev 19329)
@@ -53,7 +53,7 @@
 -------------------------- Combat --------------------------
 
     Total / Touch / Flat Footed
-AC: |AC.TOTAL||FOR.1,((6-STRLEN[AC.TOTAL])).INTVAL,6, ,NONE,NONE,1|/ |AC.TOTAL.!Armor.!NaturalArmor||FOR.1,((6-STRLEN[AC.TOTAL.!Armor.!NaturalArmor])).INTVAL,6, ,NONE,NONE,1|/ |AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|
+AC: |BONUS.COMBAT.AC.TOTAL||FOR.1,((6-STRLEN[BONUS.COMBAT.AC.TOTAL])).INTVAL,6, ,NONE,NONE,1|/ |BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor||FOR.1,((6-STRLEN[BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor])).INTVAL,6, ,NONE,NONE,1|/ |BONUS.COMBAT.AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|
 
 Initiative:   |INITIATIVEMOD.SIGN|
 BAB:          |ATTACK.MELEE|

Modified: Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm
===================================================================
--- Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -219,19 +219,19 @@
         </tr>
         <tr>
           <td class="ab" align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>DEFENSE</b></font></td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Total|</b></td>
+          <td align="center" class="abb"><b>|AC.Total|</b></td>
           <td align="center" width="29" class="font5"><br />
             =10+</td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.ClassDefense| / |BONUS.COMBAT.AC.Armor|</b></td>
+          <td align="center" class="abb"><b>|AC.ClassDefense| / |AC.Armor|</b></td>
           <td align="center" width="20" class="font5"><br />
             +</td>
           <td align="center" class="abb"><b>|STAT.1.MOD.INTVAL|</b></td>
           <td align="center" width="12" class="font5"><br />
             +</td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Size|</b></td>
+          <td align="center" class="abb"><b>|AC.Size|</b></td>
           <td align="center" width="14" class="font5"><br />
             +</td>
-          <td align="center" class="abb"><b>|BONUS.COMBAT.AC.Misc|</b></td>
+          <td align="center" class="abb"><b>|AC.Misc|</b></td>
         </tr>
         <tr>
           <td>&nbsp;</td>

Modified: Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm
===================================================================
--- Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm	2013-02-04 11:49:01 UTC (rev 19329)
@@ -253,29 +253,29 @@
         <tr>
           <td align="center" bgcolor="black"><font style="font-size:9pt" color="white"><b>AC</b></font>
             <font style="font-size:5pt" color="white"><br />Armour Class</font></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Total|</b></td>
+          <td align="center" class="border9"><b>|AC.Total|</b></td>
           <td align="center" class="font7"><b>:</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Flatfooted|</b></td>
+          <td align="center" class="border9"><b>|AC.Flatfooted|</b></td>
           <td align="center" class="font7"><b>:</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Touch|</b></td>
+          <td align="center" class="border9"><b>|AC.Touch|</b></td>
           <td align="center" class="font7"><b>=</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Base|</b></td>
+          <td align="center" class="border9"><b>|AC.Base|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Armor|</b></td>
+          <td align="center" class="border9"><b>|AC.Armor|</b></td>
 
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Shield|</b></td>
+          <td align="center" class="border9"><b>|AC.Shield|</b></td>
 
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Ability|</b></td>
+          <td align="center" class="border9"><b>|AC.Ability|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Size|</b></td>
+          <td align="center" class="border9"><b>|AC.Size|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.NaturalArmor|</b></td>
+          <td align="center" class="border9"><b>|AC.NaturalArmor|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Deflection|</b></td>
+          <td align="center" class="border9"><b>|AC.Deflection|</b></td>
           <td align="center" class="font7"><b>+</b></td>
-          <td align="center" class="border9"><b>|BONUS.COMBAT.AC.Misc|</b></td>
+          <td align="center" class="border9"><b>|AC.Misc|</b></td>
           <td align="center" width="5"></td>
           <td align="center" class="border9"><br /></td>
           <td align="center"></td>

Modified: Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/text/csheet_my_text_sheet.TXT
===================================================================
--- Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/text/csheet_my_text_sheet.TXT	2013-02-04 07:59:12 UTC (rev 19328)
+++ Trunk/pcgen/outputsheets/my_outputsheets/my_fantasy/text/csheet_my_text_sheet.TXT	2013-02-04 11:49:01 UTC (rev 19329)
@@ -53,7 +53,7 @@
 -------------------------- Combat --------------------------
 
     Total / Touch / Flat Footed
-AC: |AC.TOTAL||FOR.1,((6-STRLEN[AC.TOTAL])).INTVAL,6, ,NONE,NONE,1|/ |AC.TOTAL.!Armor.!NaturalArmor||FOR.1,((6-STRLEN[AC.TOTAL.!Armor.!NaturalArmor])).INTVAL,6, ,NONE,NONE,1|/ |AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|
+AC: |BONUS.COMBAT.AC.TOTAL||FOR.1,((6-STRLEN[BONUS.COMBAT.AC.TOTAL])).INTVAL,6, ,NONE,NONE,1|/ |BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor||FOR.1,((6-STRLEN[BONUS.COMBAT.AC.TOTAL.!Armor.!NaturalArmor])).INTVAL,6, ,NONE,NONE,1|/ |BONUS.COMBAT.AC.TOTAL.!Ability.PRESTAT:1,DEX=10.!PRESA:1,Uncanny Dodge.MIN=0|
 
 Initiative:   |INITIATIVEMOD.SIGN|
 BAB:          |ATTACK.MELEE|

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 19455
          http://sourceforge.net/p/pcgen/code/19455
Author:   amaitland
Date:     2013-02-13 22:33:59 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
MSRD - cannot output Talents
- Fixes Occupations as well
Issue#: OS-225

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/modern/pdf/csheet_modern_std.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2013-02-13 22:27:54 UTC (rev 19454)
+++ Trunk/pcgen/outputsheets/base.xml	2013-02-13 22:33:59 UTC (rev 19455)
@@ -1960,19 +1960,19 @@
 			Occupations
 	  ====================================
 	  ====================================-->
-|IIF(count("ABILITIES";"CATEGORY=Occupation";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")==0)|
+|IIF(count("ABILITIES";"CATEGORY=Starting Occupation";"VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")==0)|
 |ELSE|
 |ENDIF|
 	<occupations>
-|FOR,%occupation,0,count("ABILITIES","CATEGORY=Occupation","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")-1,1,0|
+|FOR,%occupation,0,count("ABILITIES","CATEGORY=Starting Occupation","VISIBILITY=DEFAULT[or]VISIBILITY=OUTPUT_ONLY")-1,1,0|
 		<occupation>
-			<name>|ABILITYALL.Occupation.VISIBLE.%occupation|</name>
-			<description>|ABILITYALL.Occupation.VISIBLE.%occupation.DESC|</description>
-			<type>|ABILITYALL.Occupation.VISIBLE.%occupation.TYPE|</type>
-			<associated>|ABILITYALL.Occupation.VISIBLE.%occupation.ASSOCIATED|</associated>
-			<count>|ABILITYALL.Occupation.VISIBLE.%occupation.ASSOCIATEDCOUNT|</count>
-			<source>|ABILITYALL.Occupation.VISIBLE.%occupation.SOURCE|</source>
-			<category>Occupation</category>
+			<name>|ABILITYALL.Starting Occupation.VISIBLE.%occupation|</name>
+			<description>|ABILITYALL.Starting Occupation.VISIBLE.%occupation.DESC|</description>
+			<type>|ABILITYALL.Starting Occupation.VISIBLE.%occupation.TYPE|</type>
+			<associated>|ABILITYALL.Starting Occupation.VISIBLE.%occupation.ASSOCIATED|</associated>
+			<count>|ABILITYALL.Starting Occupation.VISIBLE.%occupation.ASSOCIATEDCOUNT|</count>
+			<source>|ABILITYALL.Starting Occupation.VISIBLE.%occupation.SOURCE|</source>
+			<category>Starting Occupation</category>
 		</occupation>
 |ENDFOR|
 	</occupations>

Modified: Trunk/pcgen/outputsheets/d20/modern/pdf/csheet_modern_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/modern/pdf/csheet_modern_std.xslt	2013-02-13 22:27:54 UTC (rev 19454)
+++ Trunk/pcgen/outputsheets/d20/modern/pdf/csheet_modern_std.xslt	2013-02-13 22:33:59 UTC (rev 19455)
@@ -240,7 +240,7 @@
 		<medium color="black" background-color="lightgrey" border-color="black"/>
 		<dark color="black" background-color="lightgrey" border-color="black"/>
 		<very.dark color="black" background-color="lightgrey" border-color="black"/>
-		<inverse color="black" background-color="#999999" border-color="black"/>
+		<inverse color="white" background-color="black" border-color="black"/>
 
 		<bio display-align="after" color="black" background-color="transparent" border-color="black"></bio>
 		<bio.title border-top-width="0.5pt" border-top-style="solid"><subattrib normal=""/></bio.title>
@@ -398,6 +398,18 @@
 		<special_attacks.lightline><subattrib light=""/></special_attacks.lightline>
 		<special_attacks.darkline><subattrib medium=""/></special_attacks.darkline>
 
+		<talents.title><subattrib centre="" inverse=""/></talents.title>
+		<talents.border padding="0.5pt"><subattrib border="" inverse=""/></talents.border>
+		<talents.lightline><subattrib light=""/></talents.lightline>
+		<talents.darkline><subattrib medium=""/></talents.darkline>
+
+		<occupations.title><subattrib centre="" inverse=""/></occupations.title>
+		<occupations.border padding="0.5pt"><subattrib border="" inverse=""/></occupations.border>
+		<occupations.lightline><subattrib light=""/></occupations.lightline>
+		<occupations.darkline><subattrib medium=""/></occupations.darkline>
+
+
+
 		<archetypes.title><subattrib centre="" inverse=""/></archetypes.title>
 		<archetypes.border padding="0.5pt"><subattrib border="" inverse=""/></archetypes.border>
 		<archetypes.lightline><subattrib light=""/></archetypes.lightline>
@@ -461,6 +473,11 @@
 	</myAttribs:myAttribs>
 	<xsl:variable name="vAttribs" select="document('')/*/myAttribs:*"/>
 
+	<xsl:attribute-set name="talents.title" use-attribute-sets="border centre">
+		<xsl:attribute name="background-color">black</xsl:attribute>
+		<xsl:attribute name="border-color">black</xsl:attribute>
+		<xsl:attribute name="color">white</xsl:attribute>
+	</xsl:attribute-set>
 
 	<xsl:attribute-set name="border">
 		<xsl:attribute name="border-width">0.5pt</xsl:attribute>
@@ -1140,7 +1157,10 @@
 						<xsl:apply-templates select="special_abilities" />
 						<xsl:apply-templates select="special_qualities" />
 						<xsl:apply-templates select="feats" />
-						<xsl:apply-templates select="feats/feat[contains(., 'OCCUPATION')]" mode="starting_occupation" />
+<!-->						<xsl:apply-templates select="feats/feat[contains(., 'OCCUPATION')]" mode="starting_occupation" />	-->
+						<xsl:apply-templates select="occupations" />
+						<xsl:apply-templates select="talents" />
+
 						<xsl:apply-templates select="mutations" />
 						<xsl:apply-templates select="weapon_proficiencies" />
 						<xsl:apply-templates select="languages" />
@@ -3797,6 +3817,45 @@
 	</xsl:if>
 	</xsl:template>
 
+
+
+	<!--
+====================================
+====================================
+	TEMPLATE - Talents
+====================================
+====================================-->
+	<xsl:template match="talents">
+		<xsl:if test="count(talent) &gt; 0">
+			<xsl:call-template name="bold.list">
+				<xsl:with-param name="attribute" select="'talents'" />
+				<xsl:with-param name="title" select="'Talents'" />
+				<xsl:with-param name="list" select="talent"/>
+				<xsl:with-param name="name.tag" select="'name'"/>
+				<xsl:with-param name="desc.tag" select="'description'"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+
+	<!--
+====================================
+====================================
+	TEMPLATE - Occupations
+====================================
+====================================-->
+	<xsl:template match="occupations">
+		<xsl:if test="count(occupation) &gt; 0">
+			<xsl:call-template name="bold.list">
+				<xsl:with-param name="attribute" select="'occupations'" />
+				<xsl:with-param name="title" select="'Occupations'" />
+				<xsl:with-param name="list" select="occupation"/>
+				<xsl:with-param name="name.tag" select="'name'"/>
+				<xsl:with-param name="desc.tag" select="'description'"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template>
+
+
 <!--
 ====================================
 ====================================

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 20230
          http://sourceforge.net/p/pcgen/code/20230
Author:   amaitland
Date:     2013-05-21 14:35:06 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Initial Racial Trait OS Block

Modified Paths:
--------------
    Trunk/pcgen/outputsheets/base.xml
    Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_alt_condensed.xslt

Modified: Trunk/pcgen/outputsheets/base.xml
===================================================================
--- Trunk/pcgen/outputsheets/base.xml	2013-05-21 13:26:16 UTC (rev 20229)
+++ Trunk/pcgen/outputsheets/base.xml	2013-05-21 14:35:06 UTC (rev 20230)
@@ -1806,9 +1806,58 @@
 		</special_attack>
 |ENDFOR|
 	</special_attacks>
+
 		<!--
 	  ====================================
 	  ====================================
+			Racial Traits
+	  ====================================
+	  ====================================-->
+
+	<racial_traits>
+|FOR,%ability,0,count("ABILITIES","CATEGORY=Special Ability","TYPE=RaceTrait")-1,1,0|
+|IIF(ABILITYALL.Special Ability.%ability.TYPE=RaceTrait.HASASPECT.RaceTraitMaster:Y)|
+		<racial_trait>
+|IIF(ABILITYALL.Special Ability.%ability.TYPE=RaceTrait.TYPE:Extraordinary)|
+			<name>|ABILITYALL.Special Ability.%ability.TYPE=RaceTrait| (Ex)</name>
+|ELSE|
+|IIF(ABILITYALL.Special Ability.%ability.TYPE=RaceTrait.TYPE:Supernatural)|
+			<name>|ABILITYALL.Special Ability.%ability.TYPE=RaceTrait| (Su)</name>
+|ELSE|
+|IIF(ABILITYALL.Special Ability.%ability.TYPE=RaceTrait.TYPE:SpellLike)|
+			<name>|ABILITYALL.Special Ability.%ability.TYPE=RaceTrait| (Sp)</name>
+|ELSE|
+|ENDIF|
+|ENDIF|
+|ENDIF|
+			<header>|ABILITYALL.Special Ability.%ability.TYPE=RaceTrait|</header>
+			<description>|ABILITYALL.Special Ability.%ability.TYPE=RaceTrait.DESC|</description>
+			<type>|ABILITYALL.Special Ability.%ability.TYPE=RaceTrait.TYPE|</type>
+			<source>|ABILITYALL.Special Ability.VISIBLE.%ability.TYPE=RaceTrait.SOURCE|</source>
+			<check_count>|ABILITYALL.Special Ability.%ability.TYPE=RaceTrait.ASPECT.CheckCount.INTVAL|</check_count>
+			<check_type>|ABILITYALL.Special Ability.%ability.TYPE=RaceTrait.ASPECT.CheckType|</check_type>
+|IIF(ABILITYALL.Special Ability.%ability.TYPE=RaceTrait.HASASPECT.MasterAbility:Y)|
+			<master>|ABILITYALL.Special Ability.%ability.TYPE=RaceTrait.ASPECT.MasterAbility|</master>
+|FOR,%subability,0,count("ABILITIES","CATEGORY=Special Ability")-1,1,0|
+|IIF(ABILITYALL.Special Ability.%subability.ASPECT.ChildAbility:ABILITYALL.Special Ability.%ability.TYPE=RaceTrait.ASPECT.MasterAbility)|
+			<subability>
+				<name>|ABILITYALL.Special Ability.%subability|</name>
+				<description>|ABILITYALL.Special Ability.%subability.DESC|</description>
+				<type>|ABILITYALL.Special Ability.%subability.TYPE|</type>
+				<source>|ABILITYALL.Special Ability.%subability.SOURCE|</source>
+				<child>|ABILITYALL.Special Ability.%subability.ASPECT.ChildAbility|</child>
+			</subability>
+|ENDIF|
+|ENDFOR|
+|ENDIF|
+		</racial_trait>
+|ENDIF|
+|ENDFOR|
+	</racial_traits>
+
+		<!--
+	  ====================================
+	  ====================================
 			Animal Trick
 	  ====================================
 	  ====================================-->

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_alt_condensed.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_alt_condensed.xslt	2013-05-21 13:26:16 UTC (rev 20229)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_alt_condensed.xslt	2013-05-21 14:35:06 UTC (rev 20230)
@@ -364,6 +364,7 @@
 						<xsl:apply-templates select="special_abilities"/>
 						<xsl:apply-templates select="traits"/>
 						<xsl:apply-templates select="afflictions"/>
+						<xsl:apply-templates select="racial_traits"/>
 						<xsl:apply-templates select="special_attacks"/>
 						<xsl:apply-templates select="special_qualities"/>
 						<xsl:apply-templates select="intelligent_items"/>
@@ -5013,6 +5014,68 @@
 	</xsl:for-each>
 	</xsl:template>
 
+<!--
+====================================
+====================================
+	TEMPLATE - RACIAL TRAITS
+====================================
+====================================-->
+	<xsl:template match="racial_traits">
+	
+	<xsl:for-each select="racial_traits">
+		<!-- BEGIN Use Per Day Ability table -->
+		<fo:table table-layout="fixed" space-before="2mm" keep-together="always" border-collapse="collapse" >
+			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'checklist.border'"/></xsl:call-template>
+			<fo:table-column column-width="23mm"/>
+			<fo:table-column column-width="63mm"/>
+			<fo:table-body>
+				<fo:table-row keep-with-next.within-column="always">
+					<fo:table-cell padding-top="1pt" number-columns-spanned="2">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'checklist'"/>
+						</xsl:call-template>
+						<fo:block font-size="10pt" font-weight="bold" text-align="center">
+							<xsl:value-of select="header"/>
+						</fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+				<fo:table-row keep-with-next.within-column="always">
+					<fo:table-cell padding-top="1pt" text-align="end">
+							<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'checklist'"/>
+						</xsl:call-template>
+						<fo:block font-size="8pt" text-align="center"><xsl:value-of select="check_type"/></fo:block>
+					</fo:table-cell>
+					<fo:table-cell padding-top="1pt" padding-left="9pt">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'checklist'"/>
+						</xsl:call-template>
+						<fo:block font-size="9pt" font-family="ZapfDingbats">
+							<xsl:call-template name="for.loop">
+								<xsl:with-param name="count" select="check_count"/>
+							</xsl:call-template>
+						</fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+				<fo:table-row keep-with-next.within-column="always">
+					<fo:table-cell padding="3pt" number-columns-spanned="2">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'checklist'"/>
+						</xsl:call-template>
+						<fo:block font-size="5pt" font-weight="bold">
+						<xsl:if test="name != ''"> <xsl:value-of select="name"/>:</xsl:if>
+							<fo:inline font-size="5pt" font-weight="normal"><xsl:value-of select="description"/><xsl:if test="source != ''"> [<xsl:value-of select="source"/>]</xsl:if></fo:inline>
+						</fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+|%|
+		<!-- END Checklists table -->
+	</xsl:for-each>
+	</xsl:template>
+
+
 	<!--
 ====================================
 ====================================

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.