PCGen :: An RPG Character Generator

Revision: 13748
          http://pcgen.svn.sourceforge.net/pcgen/?rev=13748&view=rev
Author:   chuckpint
Date:     2010-11-05 20:13:05 +0000 (Fri, 05 Nov 2010)

Log Message:
-----------
OS-34 Fixed problems with skill block being too long. Also fixed problem with psionics block.

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2010-11-05 20:12:23 UTC (rev 13747)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2010-11-05 20:13:05 UTC (rev 13748)
@@ -869,13 +869,13 @@
 		<xsl:param name="RunningTotal" select="0"/>
 		<xsl:variable name="bardic_music">
 			<xsl:choose>
-				<xsl:when test="count($features/bardic_music) &gt; 0">17</xsl:when>
+				<xsl:when test="count($features/bardic_music) &gt; 0">18</xsl:when>
 				<xsl:otherwise>0</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="turning">
 			<xsl:choose>
-				<xsl:when test="count($features/turning) &gt; 0">43</xsl:when>
+				<xsl:when test="count($features/turning) &gt; 0">44</xsl:when>
 				<xsl:otherwise>0</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -928,7 +928,7 @@
 				<xsl:with-param name="features" select="/character/class_features/*"/>
 			</xsl:call-template>
 		</xsl:variable>
-		<xsl:value-of select="floor( (205-$featureheight) div 3.6) - 2"/>
+		<xsl:value-of select="floor( (198-$featureheight) div 3.6) - 2"/>
 	</xsl:template>
 	<!--
 ====================================
@@ -1837,23 +1837,23 @@
 			<xsl:variable name="columns">
 				<fo:table-column column-width="4mm"/>
 				<fo:table-column>
-					<xsl:attribute name="column-width"><xsl:value-of select="$column_width - 48" />mm</xsl:attribute>
+					<xsl:attribute name="column-width"><xsl:value-of select="$column_width - 42" />mm</xsl:attribute>
 				</fo:table-column>
-				<fo:table-column column-width="2mm"/>
 				<fo:table-column column-width="1mm"/>
-				<fo:table-column column-width="7mm"/>
 				<fo:table-column column-width="1mm"/>
+				<fo:table-column column-width="6mm"/>
 				<fo:table-column column-width="1mm"/>
-				<fo:table-column column-width="7mm"/>
 				<fo:table-column column-width="1mm"/>
-				<fo:table-column column-width="1mm"/>
 				<fo:table-column column-width="6mm"/>
 				<fo:table-column column-width="1mm"/>
 				<fo:table-column column-width="1mm"/>
-				<fo:table-column column-width="6mm"/>
+				<fo:table-column column-width="5mm"/>
 				<fo:table-column column-width="1mm"/>
 				<fo:table-column column-width="1mm"/>
-				<fo:table-column column-width="7mm"/>
+				<fo:table-column column-width="5mm"/>
+				<fo:table-column column-width="1mm"/>
+				<fo:table-column column-width="1mm"/>
+				<fo:table-column column-width="6mm"/>
 			</xsl:variable>
 
 			<fo:table table-layout="fixed" border-collapse="collapse" padding="0.5pt">
@@ -1896,27 +1896,27 @@
 							</fo:block>
 						</fo:table-cell>
 						<fo:table-cell number-columns-spanned="3">
-							<fo:block font-size="4pt">
+							<fo:block font-size="3pt">
 								KEY ABILITY
 							</fo:block>
 						</fo:table-cell>
 						<fo:table-cell number-columns-spanned="3">
-							<fo:block text-align="center" font-size="4pt">
+							<fo:block text-align="center" font-size="3pt">
 								SKILL MODIFIER
 							</fo:block>
 						</fo:table-cell>
 						<fo:table-cell number-columns-spanned="3">
-							<fo:block text-align="center" font-size="4pt">
+							<fo:block text-align="center" font-size="3pt">
 								ABILITY MODIFIER
 							</fo:block>
 						</fo:table-cell>
 						<fo:table-cell number-columns-spanned="3">
-							<fo:block text-align="center" space-before.optimum="5pt" font-size="4pt">
+							<fo:block text-align="center" font-size="3pt">
 								RANKS
 							</fo:block>
 						</fo:table-cell>
 						<fo:table-cell number-columns-spanned="2">
-							<fo:block text-align="center" font-size="4pt">
+							<fo:block text-align="center" font-size="3pt">
 								MISC MODIFIER
 							</fo:block>
 						</fo:table-cell>
@@ -1952,9 +1952,23 @@
 									</fo:block>
 								</fo:table-cell>
 								<fo:table-cell>
+                                    <xsl:choose>
+                                        <xsl:when test="string-length(name) &lt; 35">
 									<fo:block space-before.optimum="1pt" font-size="8pt">
 										<xsl:value-of select="name"/>
 									</fo:block>
+                                        </xsl:when>
+                                        <xsl:when test="string-length(name) &lt; 40">
+                                            <fo:block space-before.optimum="1pt" font-size="7pt">
+                                                <xsl:value-of select="name"/>
+                                            </fo:block>
+                                        </xsl:when>
+                                        <xsl:otherwise>
+                                            <fo:block space-before.optimum="1pt" font-size="6pt" wrap-option="no-wrap">
+                                                <xsl:value-of select="name"/>
+                                            </fo:block>
+                                        </xsl:otherwise>
+                                    </xsl:choose>
 								</fo:table-cell>
 								<fo:table-cell number-columns-spanned="2"/>
 								<fo:table-cell>
@@ -3870,9 +3884,9 @@
 		<fo:table-cell padding-top="1pt" text-align="end">
 			<xsl:attribute name="number-columns-spanned"><xsl:value-of select="$title.cols"/></xsl:attribute>
 			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'psionics.title'"/></xsl:call-template>
-			<fo:block font-size="8pt"><xsl:value-of select="$title"/></fo:block>
+			<fo:block font-size="8pt"><xsl:value-of select="$title"/>:</fo:block>
 		</fo:table-cell>
-		<fo:table-cell padding-top="1pt" padding-left="3pt">
+		<fo:table-cell padding-top="1pt" text-align="center">
 			<xsl:attribute name="number-columns-spanned"><xsl:value-of select="$value.cols"/></xsl:attribute>
 			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'psionics'"/></xsl:call-template>
 			<fo:block font-size="8pt"><xsl:value-of select="$value"/></fo:block>
@@ -3886,29 +3900,40 @@
 ====================================-->
 	<xsl:template match="psionics">
 		<!-- BEGIN psionicsTable -->
-		<fo:table table-layout="fixed" space-before="2mm" padding="0.5pt">
+        <xsl:variable name="endpoints" select="7"/>
+		<fo:table table-layout="fixed" space-before="2mm">
 			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'psionics.border'"/></xsl:call-template>
 			<fo:table-column>
-				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * $pagePrintableWidth div 6" />mm</xsl:attribute>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * ($pagePrintableWidth - $endpoints) div 6" />mm</xsl:attribute>
 			</fo:table-column>
 			<fo:table-column>
-				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * $pagePrintableWidth div 6" />mm</xsl:attribute>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * ($pagePrintableWidth - $endpoints) div 12" />mm</xsl:attribute>
 			</fo:table-column>
+            <fo:table-column column-width="0.5mm"/>
 			<fo:table-column>
-				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * $pagePrintableWidth div 6" />mm</xsl:attribute>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * ($pagePrintableWidth - $endpoints) div 6" />mm</xsl:attribute>
 			</fo:table-column>
 			<fo:table-column>
-				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * $pagePrintableWidth div 6" />mm</xsl:attribute>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * ($pagePrintableWidth - $endpoints) div 12" />mm</xsl:attribute>
 			</fo:table-column>
+            <fo:table-column column-width="0.5mm"/>
 			<fo:table-column>
-				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * $pagePrintableWidth div 6" />mm</xsl:attribute>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * ($pagePrintableWidth - $endpoints) div 6" />mm</xsl:attribute>
 			</fo:table-column>
 			<fo:table-column>
-				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * $pagePrintableWidth div 6" />mm</xsl:attribute>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * ($pagePrintableWidth - $endpoints) div 12" />mm</xsl:attribute>
 			</fo:table-column>
+            <fo:table-column column-width="0.5mm"/>
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * ($pagePrintableWidth - $endpoints) div 6" />mm</xsl:attribute>
+			</fo:table-column>
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.55 * ($pagePrintableWidth - $endpoints) div 12" />mm</xsl:attribute>
+			</fo:table-column>
+            <fo:table-column column-width="0.5mm"/>
 			<fo:table-body>
 				<fo:table-row keep-with-next.within-column="always">
-					<fo:table-cell padding-top="1pt" number-columns-spanned="6">
+					<fo:table-cell padding-top="1pt" number-columns-spanned="12">
 						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'psionics.title'"/></xsl:call-template>
 						<fo:block font-size="10pt" font-weight="bold">Psionics</fo:block>
 					</fo:table-cell>
@@ -3918,21 +3943,22 @@
 						<xsl:with-param name="title" select="'Base PP'"/>
 						<xsl:with-param name="value" select="base_pp"/>
 					</xsl:call-template>
+					<fo:table-cell/>
 					<xsl:call-template name="psionic.entry">
 						<xsl:with-param name="title" select="'Bonus  PP'"/>
 						<xsl:with-param name="value" select="bonus_pp"/>
 					</xsl:call-template>
+					<fo:table-cell/>
 					<xsl:call-template name="psionic.entry">
 						<xsl:with-param name="title" select="'Total PP'"/>
 						<xsl:with-param name="value" select="total_pp"/>
 					</xsl:call-template>
-				</fo:table-row>
-				<fo:table-row keep-with-next.within-column="always">
+					<fo:table-cell/>
 					<xsl:call-template name="psionic.entry">
 						<xsl:with-param name="title" select="'Current PP'"/>
 						<xsl:with-param name="value" select="''"/>
-						<xsl:with-param name="value.cols" select="5"/>
 					</xsl:call-template>
+					<fo:table-cell/>
 				</fo:table-row>
 			</fo:table-body>
 		</fo:table>


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

Revision: 13812
          http://pcgen.svn.sourceforge.net/pcgen/?rev=13812&view=rev
Author:   chuckpint
Date:     2010-11-08 23:03:51 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
OS-20 Added indicator when encumbrance is not "Light". Shows up on the PDF sheet just under BAB.

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2010-11-08 21:39:41 UTC (rev 13811)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2010-11-08 23:03:51 UTC (rev 13812)
@@ -283,6 +283,7 @@
 									<fo:table-cell>
 										<xsl:apply-templates select="initiative"/>
 										<xsl:apply-templates select="basics/bab" mode="bab"/>
+                                        <xsl:call-template name="encumberance"/>
 									</fo:table-cell>
 									<fo:table-cell number-rows-spanned="2">
 										<xsl:apply-templates select="skills">
@@ -1788,6 +1789,49 @@
 		<!-- END ini-base table -->
 	</xsl:template>
 
+	<!--
+====================================
+====================================
+	TEMPLATE - encumberance TABLE
+====================================
+====================================-->
+	<xsl:template name="encumberance">
+		<!-- BEGIN encumberance table -->
+        <xsl:if test="/character/equipment/total/load != 'Light'">
+		<fo:table table-layout="fixed">
+			<!-- 0.26 * $pagePrintableWidth - 2 mm -->
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.50 * (0.26 * $pagePrintableWidth - 4)" />mm</xsl:attribute>
+			</fo:table-column>
+			<fo:table-column column-width="2mm"/>
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.50 * (0.26 * $pagePrintableWidth - 4)" />mm</xsl:attribute>
+			</fo:table-column>
+			<fo:table-body>
+				<fo:table-row height="2pt"/>
+				<fo:table-row>
+					<fo:table-cell>
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'initiative.title'"/>
+						</xsl:call-template>
+					<fo:block line-height="10pt" font-weight="bold" font-size="7pt" space-before="1pt">ENCUMBERANCE</fo:block>
+					</fo:table-cell>
+					<fo:table-cell/>
+					<fo:table-cell>
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'initiative.total'"/>
+						</xsl:call-template>
+						<fo:block space-before.optimum="2pt" font-size="10pt">
+							<xsl:value-of select="/character/equipment/total/load"/>
+						</fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+        </xsl:if>
+		<!-- END encumberance table -->
+	</xsl:template>
+
 	<xsl:template name="skills.empty">
 		<xsl:param name="pos"/>
 


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

Revision: 14437
          http://pcgen.svn.sourceforge.net/pcgen/?rev=14437&view=rev
Author:   chuckpint
Date:     2011-01-25 03:39:11 +0000 (Tue, 25 Jan 2011)

Log Message:
-----------
OS-55 Trimmed the footer by 2mm by getting rid of the "OS Suggestions" text.

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-01-25 03:10:42 UTC (rev 14436)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-01-25 03:39:11 UTC (rev 14437)
@@ -170,7 +170,7 @@
 					<xsl:attribute name="margin-left"><xsl:value-of select="$pageMarginLeft" />mm</xsl:attribute>
 					<xsl:attribute name="margin-right"><xsl:value-of select="$pageMarginRight" />mm</xsl:attribute>
 					<fo:region-body region-name="body" column-count="2" column-gap="2mm" margin-bottom="7mm"/>
-					<fo:region-after region-name="footer" extent="6.4mm"/>
+					<fo:region-after region-name="footer" extent="4.4mm"/>
 				</fo:simple-page-master>
 				<fo:simple-page-master master-name="Portrait">
 					<xsl:attribute name="page-height"><xsl:value-of select="$pageHeight" />mm</xsl:attribute>
@@ -180,7 +180,7 @@
 					<xsl:attribute name="margin-left"><xsl:value-of select="$pageMarginLeft" />mm</xsl:attribute>
 					<xsl:attribute name="margin-right"><xsl:value-of select="$pageMarginRight" />mm</xsl:attribute>
 					<fo:region-body region-name="body" margin-bottom="7mm"/>
-					<fo:region-after region-name="footer" extent="6.4mm"/>
+					<fo:region-after region-name="footer" extent="4.4mm"/>
 				</fo:simple-page-master>
 			</fo:layout-master-set>
 	</xsl:template>
@@ -219,11 +219,10 @@
 					<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"/></fo:block>
 						<fo:block font-size="5pt" font-weight="bold">Player: <xsl:value-of select="/character/basics/playername"/></fo:block>
-						<fo:block font-size="5pt" font-weight="bold">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: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">For suggestions please post to pcgen@... with "OS Suggestion" in the subject line.</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: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/>
@@ -907,7 +906,7 @@
 				<xsl:with-param name="features" select="/character/class_features/*"/>
 			</xsl:call-template>
 		</xsl:variable>
-		<!-- 143 is the number of mm available to weapons and features
+		<!-- 145 is the number of mm available to weapons and features
 		 28mm is the size of a single large ranged weapon block
 		 20mm is the size of a single large weapon block
 		 24mm is the size of a single simple weapon block
@@ -939,7 +938,7 @@
 				<xsl:with-param name="features" select="/character/class_features/*"/>
 			</xsl:call-template>
 		</xsl:variable>
-		<xsl:value-of select="floor( (198-$featureheight) div 3.6) - 2"/>
+		<xsl:value-of select="floor( (200-$featureheight) div 3.6) - 2"/>
 	</xsl:template>
 	<!--
 ====================================


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

Revision: 14559
          http://pcgen.svn.sourceforge.net/pcgen/?rev=14559&view=rev
Author:   amaitland
Date:     2011-02-12 21:14:22 +0000 (Sat, 12 Feb 2011)

Log Message:
-----------
Eclipse Channeling Block

Issue#: OS-60

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-02-12 04:41:50 UTC (rev 14558)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-02-12 21:14:22 UTC (rev 14559)
@@ -295,6 +295,7 @@
 										<xsl:apply-templates select="class_features/turning[@kind='UNDEAD']">
 											<xsl:with-param name="column_width" select="0.45 * $pagePrintableWidth"/>
 										</xsl:apply-templates>
+										<xsl:apply-templates select="class_features/eclipse_channeling"/>
 										<xsl:apply-templates select="class_features/channel_energy"/>
 									</fo:table-cell>
 								</fo:table-row>
@@ -883,13 +884,19 @@
 				<xsl:otherwise>0</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
+		<xsl:variable name="eclipse_channeling">
+			<xsl:choose>
+				<xsl:when test="count($features/eclipse_channeling) &gt; 0">44</xsl:when>
+				<xsl:otherwise>0</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<xsl:variable name="channel_energy">
 			<xsl:choose>
 				<xsl:when test="count($features/channel_energy) &gt; 0">14</xsl:when>
 				<xsl:otherwise>0</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:copy-of select="$bardic_music + $turning + $channel_energy"/>
+		<xsl:copy-of select="$bardic_music + $turning + $eclipse_channeling + $channel_energy"/>
 	</xsl:template>
 	<!--
 ====================================
@@ -3587,9 +3594,263 @@
 		</xsl:call-template>
 	</xsl:template>
 
+
 	<!--
 ====================================
 ====================================
+	TEMPLATE - Eclipse Channeling
+====================================
+====================================-->
+	<xsl:template name="eclipse_channeling.intensity">
+		<xsl:param name="die"/>
+		<xsl:param name="number"/>
+
+		<xsl:variable name="shade">
+			<xsl:choose>
+				<xsl:when test="$number mod 2 = 0">darkline</xsl:when>
+				<xsl:otherwise>lightline</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<fo:table-row>
+			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="concat('turning.', $shade)"/></xsl:call-template>
+			<fo:table-cell>
+				<fo:block font-size="7pt"><xsl:value-of select="$die"/></fo:block>
+			</fo:table-cell>
+			<fo:table-cell>
+				<fo:block font-size="7pt"><xsl:value-of select="$number"/></fo:block>
+			</fo:table-cell>
+		</fo:table-row>
+	</xsl:template>
+	<!--
+====================================
+====================================
+	TEMPLATE - Eclipse Channeling Info
+====================================
+====================================-->
+	<xsl:template name="eclipse_channeling.info">
+		<xsl:param name="title"/>
+		<xsl:param name="info"/>
+
+		<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>
+				<fo:block font-size="8pt">
+					<xsl:value-of select="$title"/>
+				</fo:block>
+			</fo:table-cell>
+			<fo:table-cell padding-top="1pt">
+				<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'turning'"/></xsl:call-template>
+				<fo:block font-size="8pt">
+					<xsl:value-of select="$info"/>
+				</fo:block>
+			</fo:table-cell>
+		</fo:table-row>
+	</xsl:template>
+	<!--
+====================================
+====================================
+	TEMPLATE - Eclipse Channeling
+====================================
+====================================-->
+	<xsl:template match="eclipse_channeling">
+		<xsl:param name="column_width" select="0.45 * $pagePrintableWidth"/>
+		<!-- 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>
+			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'turning.border'"/></xsl:call-template>
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.60 * $column_width" />mm</xsl:attribute>
+			</fo:table-column>
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.40 * $column_width" />mm</xsl:attribute>
+			</fo:table-column>
+			<fo:table-body>
+				<fo:table-row keep-with-next.within-column="always">
+					<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'turning.title'"/></xsl:call-template>
+					<fo:table-cell padding-top="1pt" number-columns-spanned="2">
+						<fo:block font-size="10pt" font-weight="bold">
+							<xsl:value-of select="concat(@type, ' ', @kind)"/>
+						</fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+				<fo:table-row>
+					<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'turning.title'"/></xsl:call-template>
+					<fo:table-cell>
+						<fo:table table-layout="fixed">
+							<fo:table-column>
+								<xsl:attribute name="column-width"><xsl:value-of select="0.30 * $column_width" />mm</xsl:attribute>
+							</fo:table-column>
+							<fo:table-column>
+								<xsl:attribute name="column-width"><xsl:value-of select="0.30 * $column_width" />mm</xsl:attribute>
+							</fo:table-column>
+							<fo:table-body>
+								<fo:table-row>
+									<fo:table-cell>
+										<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'turning.title'"/></xsl:call-template>
+										<fo:block font-size="7pt">INTENSITY CHECK</fo:block>
+										<fo:block font-size="7pt">RESULT</fo:block>
+									</fo:table-cell>
+									<fo:table-cell>
+										<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'turning.title'"/></xsl:call-template>
+										<fo:block font-size="7pt"><xsl:value-of select="@kind"/> Intensity</fo:block>
+										<fo:block font-size="6pt">(Level)</fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+							</fo:table-body>
+						</fo:table>
+					</fo:table-cell>
+					<fo:table-cell>
+						<fo:table table-layout="fixed" border-collapse="collapse" padding="0.5pt">
+							<fo:table-column>
+								<xsl:attribute name="column-width"><xsl:value-of select="0.20 * $column_width" />mm</xsl:attribute>
+							</fo:table-column>
+							<fo:table-column>
+								<xsl:attribute name="column-width"><xsl:value-of select="0.20 * $column_width" />mm</xsl:attribute>
+							</fo:table-column>
+							<fo:table-body>
+								<xsl:call-template name="eclipse_channeling.info">
+									<xsl:with-param name="title" select="'Intensity Check'"/>
+									<xsl:with-param name="info" select="channeling_check" />
+								</xsl:call-template>
+							</fo:table-body>
+						</fo:table>
+					</fo:table-cell>
+				</fo:table-row>
+				<fo:table-row keep-with-next.within-column="always">
+					<fo:table-cell>
+						<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'turning.title'"/></xsl:call-template>
+						<fo:table table-layout="fixed"  border-collapse="collapse" padding="0.5pt">
+							<fo:table-column>
+								<xsl:attribute name="column-width"><xsl:value-of select="0.30 * $column_width" />mm</xsl:attribute>
+							</fo:table-column>
+							<fo:table-column>
+								<xsl:attribute name="column-width"><xsl:value-of select="0.30 * $column_width" />mm</xsl:attribute>
+							</fo:table-column>
+							<fo:table-body>
+								<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: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: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: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: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: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: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: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: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: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:call-template>
+							</fo:table-body>
+						</fo:table>
+					</fo:table-cell>
+					<fo:table-cell>
+						<fo:table table-layout="fixed" border-collapse="collapse" padding="0.5pt">
+							<fo:table-column>
+								<xsl:attribute name="column-width"><xsl:value-of select="0.20 * $column_width" />mm</xsl:attribute>
+							</fo:table-column>
+							<fo:table-column>
+								<xsl:attribute name="column-width"><xsl:value-of select="0.20 * $column_width" />mm</xsl:attribute>
+							</fo:table-column>
+							<fo:table-body>
+								<xsl:call-template name="eclipse_channeling.info">
+									<xsl:with-param name="title" select="'Channeling level'"/>
+									<xsl:with-param name="info" select="level" />
+								</xsl:call-template>
+								<xsl:call-template name="eclipse_channeling.info">
+									<xsl:with-param name="title" select="'Magnitude'"/>
+									<xsl:with-param name="info" select="damage" />
+								</xsl:call-template>
+								<xsl:call-template name="eclipse_channeling.info">
+									<xsl:with-param name="title" select="'Range'"/>
+									<xsl:with-param name="info" select="range" />
+								</xsl:call-template>
+								<fo:table-row>
+									<fo:table-cell number-columns-spanned="2" padding-top="1pt" text-align="end">
+										<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'turning.title'"/></xsl:call-template>
+										<fo:block font-size="8pt" padding-top="2pt">
+											<xsl:value-of select="notes"/>
+										</fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+							</fo:table-body>
+						</fo:table>
+					</fo:table-cell>
+				</fo:table-row>
+				<fo:table-row>
+					<fo:table-cell number-columns-spanned="2">
+						<fo:table border-collapse="collapse" padding="0.5pt" table-layout="fixed">
+							<fo:table-column column-width="22mm"/>
+							<fo:table-column>
+								<xsl:attribute name="column-width"><xsl:value-of select="$column_width - 22" />mm</xsl:attribute>
+							</fo:table-column>
+							<fo:table-body>
+								<xsl:call-template name="eclipse_channeling.per.day">
+									<xsl:with-param name="title" select="concat(@type, '/DAY')"/>
+									<xsl:with-param name="value" select="uses_per_day"/>
+								</xsl:call-template>
+							</fo:table-body>
+						</fo:table>
+					</fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+		<!-- END Eclipse Table -->
+	</xsl:template>
+	<!--
+====================================
+====================================
+	TEMPLATE - Eclipse Channeling - Uses Per Day
+====================================
+====================================-->
+
+	<xsl:template name="eclipse_channeling.per.day">
+		<xsl:param name="title" />
+		<xsl:param name="value"/>
+		<fo:table-row>
+			<fo:table-cell  padding-top="2pt" padding-right="2pt">
+				<fo:block text-align="end" display-align="center" font-size="9pt"><xsl:value-of select="$title"/></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="'turning'"/></xsl:call-template>
+				<fo:block text-align="start" font-size="10pt" font-family="ZapfDingbats">
+					<xsl:call-template name="for.loop">
+						<xsl:with-param name="count" select="$value"/>
+					</xsl:call-template>
+				</fo:block>
+			</fo:table-cell>
+		</fo:table-row>
+	</xsl:template>
+	<!--
+====================================
+====================================
 	TEMPLATE - TURNING
 ====================================
 ====================================-->


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

Revision: 14724
          http://pcgen.svn.sourceforge.net/pcgen/?rev=14724&view=rev
Author:   amaitland
Date:     2011-03-17 04:09:21 +0000 (Thu, 17 Mar 2011)

Log Message:
-----------
fix an export OS issue

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-03-16 18:12:44 UTC (rev 14723)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-03-17 04:09:21 UTC (rev 14724)
@@ -3161,8 +3161,9 @@
 						<fo:block font-size="8pt">
 							<xsl:value-of select="$to_hit"/>
 						</fo:block>
+					</fo:table-cell>
 <End DATA-73 Work Around -->
-					</fo:table-cell>
+					
 					<fo:table-cell>
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'weapon.hilight'"/>


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

Revision: 14918
          http://pcgen.svn.sourceforge.net/pcgen/?rev=14918&view=rev
Author:   amaitland
Date:     2011-05-07 03:25:21 +0000 (Sat, 07 May 2011)

Log Message:
-----------
Clean up Spells Display - Schools no longer overlapping multiple lines; Time no longer consistently taking two lines. Save Now less likely to take two lines. EFFECT has entire length to use for length descriptions. Space added for PF Concentration.

Issue#: OS-72

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-07 01:47:07 UTC (rev 14917)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-07 03:25:21 UTC (rev 14918)
@@ -6090,24 +6090,24 @@
 		<fo:table-column>
 			<xsl:attribute name="column-width"><xsl:value-of select="$pagePrintableWidth - 153" />mm</xsl:attribute>
 		</fo:table-column>
-		<!-- name -->
-		<fo:table-column column-width="5mm"/>
-		<!-- dc -->
-		<fo:table-column column-width="18mm"/>
+		<!-- name ^ -->
+		<fo:table-column column-width="38mm"/>
+		<!-- SR, DC, Save = 18+15+9  42-->
+<!-->		<fo:table-column column-width="9mm"/>	-->
 		<!-- saving throw -->
-		<fo:table-column column-width="9mm"/>
+		<fo:table-column column-width="18mm"/>	
 		<!-- time -->
-		<fo:table-column column-width="32mm"/>
+		<fo:table-column column-width="34mm"/>
 		<!-- duration -->
-		<fo:table-column column-width="16mm"/>
+		<fo:table-column column-width="18mm"/>
 		<!-- range -->
-		<fo:table-column column-width="9mm"/>
+		<fo:table-column column-width="18mm"/>
 		<!-- comp -->
-		<fo:table-column column-width="18mm"/>
-		<!-- SR -->
-		<fo:table-column column-width="15mm"/>
+		<fo:table-column column-width="13mm"/>
+		<!-- SR 
+		<fo:table-column column-width="15mm"/>	-->
 		<!-- school -->
-		<fo:table-column column-width="20mm"/>
+		<fo:table-column column-width="6mm"/>
 		<!-- source -->
 		<fo:table-header>
 			<fo:table-row>
@@ -6159,11 +6159,11 @@
 				<fo:block text-align="start" font-size="5pt" font-weight="bold">Name</fo:block>
 			</fo:table-cell>
 			<fo:table-cell padding-top="1pt">
-				<fo:block text-align="start" font-size="5pt" font-weight="bold">DC</fo:block>
+				<fo:block text-align="start" font-size="5pt" font-weight="bold">DC, Save / Spell Resistance</fo:block>
 			</fo:table-cell>
-			<fo:table-cell padding-top="1pt">
+<!-->			<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> -->
 			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt" font-weight="bold">Time</fo:block>
 			</fo:table-cell>
@@ -6176,12 +6176,12 @@
 			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt" font-weight="bold">Comp.</fo:block>
 			</fo:table-cell>
-			<fo:table-cell padding-top="1pt">
+<!-->			<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: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>	<-->
 			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt" font-weight="bold">Source</fo:block>
 			</fo:table-cell>
@@ -6253,15 +6253,16 @@
 				</fo:block>
 			</fo:table-cell>
 			<fo:table-cell padding-top="1pt">
-				<fo:block text-align="start" font-size="5pt">
-					<xsl:value-of select="dc"/>
+				<fo:block text-align="start" font-size="5pt" font-weight="bold">
+					<fo:inline font-weight="bold">DC: </fo:inline> <xsl:value-of select="dc"/> 
+					<fo:inline>, </fo:inline> <xsl:value-of select="saveinfo"/>
+					<fo:inline font-weight="bold">; SR: </fo:inline> <xsl:value-of select="spell_resistance"/>
 				</fo:block>
 			</fo:table-cell>
-			<fo:table-cell padding-top="1pt">
+<!-->			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt">
-					<xsl:value-of select="saveinfo"/>
 				</fo:block>
-			</fo:table-cell>
+			</fo:table-cell>	-->
 			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt">
 					<xsl:value-of select="castingtime"/>
@@ -6282,16 +6283,16 @@
 					<xsl:value-of select="components"/>
 				</fo:block>
 			</fo:table-cell>
-			<fo:table-cell padding-top="1pt">
+<!-->			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt">
-					<xsl:value-of select="spell_resistance"/>
+					
 				</fo:block>
-			</fo:table-cell>
-			<fo:table-cell padding-top="1pt">
+			</fo:table-cell>	-->
+<!-->			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt">
 					<xsl:value-of select="school/fullschool"/>
 				</fo:block>
-			</fo:table-cell>
+			</fo:table-cell>	<!-->
 			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt">
 					<xsl:value-of select="source/sourceshort"/>
@@ -6302,7 +6303,7 @@
 		</fo:table-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: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">
@@ -6311,7 +6312,14 @@
 						</xsl:call-template>
 					</fo:block>
 				</fo:block>
+			</fo:table-cell>	-->
+			<fo:table-cell padding-top="1pt" number-columns-spanned="3">
+				<fo:block text-align="start" font-size="5pt">
+					<fo:inline font-style="italic">School: </fo:inline>
+					<xsl:value-of select="school/fullschool"/>
+				</fo:block>
 			</fo:table-cell>
+			
 			<fo:table-cell padding-top="1pt" number-columns-spanned="3">
 				<fo:block text-align="start" font-size="5pt">
 					<fo:inline font-style="italic">Target: </fo:inline>
@@ -6324,7 +6332,24 @@
 					<xsl:value-of select="casterlevel"/>
 				</fo:block>
 			</fo:table-cell>
+			<!-- Placeholder for future concentration for spells>
+			<fo:table-cell padding-top="1pt">
+				<fo:block text-align="start" font-size="5pt">
+					<fo:inline font-style="italic">Concentration: </fo:inline>
+					<xsl:value-of select="SPELLLISTCLASS.0.CONCENTRATION"/>
+				</fo:block>
+			</fo:table-cell>	-->
 		</fo:table-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="10">
+				<fo:block text-align="start" font-size="5pt">
+					<fo:inline font-style="italic">Effect: </fo:inline>
+					<xsl:value-of select="effect"/>
+				</fo:block>
+			</fo:table-cell>
+		</fo:table-row>
+
 	</xsl:template>
 	<!--
 ====================================


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

Revision: 14939
          http://pcgen.svn.sourceforge.net/pcgen/?rev=14939&view=rev
Author:   amaitland
Date:     2011-05-08 03:16:48 +0000 (Sun, 08 May 2011)

Log Message:
-----------
OS-72 = Clean up Spells Display
OS-64 = Known spells row not applicable, can it be disabled?


Issue#: OS-72,OS-64

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-08 02:54:53 UTC (rev 14938)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-08 03:16:48 UTC (rev 14939)
@@ -352,6 +352,7 @@
 						<xsl:apply-templates select="weight_allowance"/>
 						<xsl:call-template name="money"/>
 						<xsl:apply-templates select="misc/magics"/>
+						<xsl:apply-templates select="languages"/>
 						<xsl:apply-templates select="misc/companions"/>
 						<xsl:apply-templates select="archetypes"/>	
 						<xsl:apply-templates select="animal_tricks"/>	
@@ -397,7 +398,6 @@
 						<xsl:apply-templates select="feats"/>
 						<xsl:apply-templates select="domains"/>
 						<xsl:apply-templates select="weapon_proficiencies"/>
-						<xsl:apply-templates select="languages"/>
 						<xsl:apply-templates select="templates"/>
 						<xsl:apply-templates select="prohibited_schools"/>
 						<xsl:apply-templates select="companions"/>
@@ -4757,6 +4757,15 @@
 			</fo:table-body>
 		</fo:table>
 	</xsl:template>
+
+
+
+
+
+
+
+
+<!-- Disable Previous Equipment Block> -->
 	<!--
 ====================================
 ====================================
@@ -5148,6 +5157,16 @@
 			</fo:table>
 		</xsl:if>
 	</xsl:template>
+
+<!-- Diable Previous Equipment Stuff -->
+
+	
+	
+	
+	
+	
+	
+	
 	<!--
 ====================================
 ====================================
@@ -5957,7 +5976,10 @@
 			<fo:table-column column-width="proportional-column-width(2)"/>
 			<fo:table-body>
 				<xsl:apply-templates select="." mode="spell.level.count"/>
-				<xsl:apply-templates select="." mode="spell.level.known"/>
+				<xsl:if test="@memorize='false'">
+					<xsl:apply-templates select="." mode="spell.level.known"/>
+				</xsl:if>
+<!-->				<xsl:apply-templates select="." mode="spell.level.known"/>-->
 				<xsl:apply-templates select="." mode="spell.level.cast"/>
 			</fo:table-body>
 		</fo:table>
@@ -5975,7 +5997,7 @@
 				<xsl:call-template name="attrib">
 					<xsl:with-param name="attribute" select="'spelllist.known.header'"/>
 				</xsl:call-template>
-				<fo:block font-size="6pt" font-weight="bold" space-start="2pt" space-before="2pt" space-after="1pt">LEVEL</fo:block>
+				<fo:block font-size="6pt" font-weight="bold" space-start="2pt" space-before="3pt" space-after="1pt"> LEVEL</fo:block>
 			</fo:table-cell>
 			<xsl:for-each select="level">
 				<fo:table-cell>
@@ -6003,7 +6025,7 @@
 				<xsl:call-template name="attrib">
 					<xsl:with-param name="attribute" select="'spelllist.known.header'"/>
 				</xsl:call-template>
-				<fo:block font-size="6pt" font-weight="bold" space-start="2pt" space-before="2pt" space-after="1pt">KNOWN</fo:block>
+				<fo:block font-size="6pt" font-weight="bold" space-start="2pt" space-before="3pt" space-after="1pt"> KNOWN</fo:block>
 			</fo:table-cell>
 			<xsl:for-each select="level">
 				<fo:table-cell>
@@ -6031,7 +6053,7 @@
 				<xsl:call-template name="attrib">
 					<xsl:with-param name="attribute" select="'spelllist.known.header'"/>
 				</xsl:call-template>
-				<fo:block font-size="6pt" font-weight="bold" space-start="2pt" space-before="2pt" space-after="1pt">PER DAY</fo:block>
+				<fo:block font-size="6pt" font-weight="bold" space-start="2pt" space-before="3pt" space-after="1pt">PER DAY</fo:block>
 			</fo:table-cell>
 			<xsl:for-each select="level">
 				<fo:table-cell>
@@ -6052,6 +6074,7 @@
 	TEMPLATE - KNOWN SPELL LEVEL
 ====================================
 ====================================-->
+
 	<xsl:template match="level" mode="known.spells">
 		<xsl:param name="columnOne" select="'Boxes'"/>
 		<xsl:param name="columnOneTitle" select="''"/>
@@ -6076,7 +6099,10 @@
 			<fo:table-row height="1mm"/>
 		</xsl:if>
 	</xsl:template>
-	<!--
+
+
+
+	<!-- This is the INFORMATION right above the Spells Output
 ====================================
 ====================================
 	TEMPLATE - KNOWN SPELL HEADER ROW
@@ -6091,23 +6117,23 @@
 			<xsl:attribute name="column-width"><xsl:value-of select="$pagePrintableWidth - 153" />mm</xsl:attribute>
 		</fo:table-column>
 		<!-- name ^ -->
-		<fo:table-column column-width="38mm"/>
-		<!-- SR, DC, Save = 18+15+9  42-->
+		<fo:table-column column-width="38mm"/> <!-- Name -->
+		<!-- SR, DC, Save = 18+15+9  42--> <!-- SR/DC/Save -->
 <!-->		<fo:table-column column-width="9mm"/>	-->
 		<!-- saving throw -->
-		<fo:table-column column-width="18mm"/>	
+		<fo:table-column column-width="18mm"/>	<!-- SR/DC/Save -->
 		<!-- time -->
-		<fo:table-column column-width="34mm"/>
+		<fo:table-column column-width="34mm"/>	<!-- Time -->
 		<!-- duration -->
-		<fo:table-column column-width="18mm"/>
+		<fo:table-column column-width="18mm"/>	<!-- Duration -->
 		<!-- range -->
-		<fo:table-column column-width="18mm"/>
+		<fo:table-column column-width="18mm"/>	<!-- Range -->
 		<!-- comp -->
-		<fo:table-column column-width="13mm"/>
+		<fo:table-column column-width="13mm"/>	<!-- Comps -->
 		<!-- SR 
 		<fo:table-column column-width="15mm"/>	-->
 		<!-- school -->
-		<fo:table-column column-width="6mm"/>
+		<fo:table-column column-width="6mm"/>	<!-- Source -->
 		<!-- source -->
 		<fo:table-header>
 			<fo:table-row>
@@ -6159,7 +6185,7 @@
 				<fo:block text-align="start" font-size="5pt" font-weight="bold">Name</fo:block>
 			</fo:table-cell>
 			<fo:table-cell padding-top="1pt">
-				<fo:block text-align="start" font-size="5pt" font-weight="bold">DC, Save / Spell Resistance</fo:block>
+				<fo:block text-align="start" font-size="5pt" font-weight="bold">Save Information</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>
@@ -6253,11 +6279,12 @@
 				</fo:block>
 			</fo:table-cell>
 			<fo:table-cell padding-top="1pt">
-				<fo:block text-align="start" font-size="5pt" font-weight="bold">
-					<fo:inline font-weight="bold">DC: </fo:inline> <xsl:value-of select="dc"/> 
-					<fo:inline>, </fo:inline> <xsl:value-of select="saveinfo"/>
-					<fo:inline font-weight="bold">; SR: </fo:inline> <xsl:value-of select="spell_resistance"/>
-				</fo:block>
+					<fo:block text-align="start" font-size="5pt" font-weight="bold">
+						<xsl:if test="dc &gt; 0">
+						<fo:inline font-weight="bold">DC: </fo:inline> <xsl:value-of select="dc"/> 
+						<fo:inline>, </fo:inline> <xsl:value-of select="saveinfo"/>
+						</xsl:if>
+					</fo:block>
 			</fo:table-cell>
 <!-->			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt">
@@ -6301,6 +6328,7 @@
 				</fo:block>
 			</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">
@@ -6313,13 +6341,18 @@
 					</fo:block>
 				</fo:block>
 			</fo:table-cell>	-->
-			<fo:table-cell padding-top="1pt" number-columns-spanned="3">
+			<fo:table-cell padding-top="1pt" number-columns-spanned="2">
 				<fo:block text-align="start" font-size="5pt">
 					<fo:inline font-style="italic">School: </fo:inline>
 					<xsl:value-of select="school/fullschool"/>
 				</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">SR: </fo:inline>
+					<xsl:value-of select="spell_resistance"/>
+				</fo:block>
+			</fo:table-cell>
 			<fo:table-cell padding-top="1pt" number-columns-spanned="3">
 				<fo:block text-align="start" font-size="5pt">
 					<fo:inline font-style="italic">Target: </fo:inline>
@@ -6332,14 +6365,17 @@
 					<xsl:value-of select="casterlevel"/>
 				</fo:block>
 			</fo:table-cell>
-			<!-- Placeholder for future concentration for spells>
+			<!-- Placeholder for future concentration for spells -->
 			<fo:table-cell padding-top="1pt">
 				<fo:block text-align="start" font-size="5pt">
-					<fo:inline font-style="italic">Concentration: </fo:inline>
-					<xsl:value-of select="SPELLLISTCLASS.0.CONCENTRATION"/>
+					<xsl:if test="SPELLLISTCLASS.0.CONCENTRATION &gt; 0">
+						<fo:inline font-style="italic">Concentration: </fo:inline>
+						<xsl:value-of select="SPELLLISTCLASS.0.CONCENTRATION"/>
+					</xsl:if>
 				</fo:block>
 			</fo:table-cell>	-->
 		</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>
 			<fo:table-cell padding-top="1pt" number-columns-spanned="10">


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

Revision: 14945
          http://pcgen.svn.sourceforge.net/pcgen/?rev=14945&view=rev
Author:   amaitland
Date:     2011-05-09 02:22:31 +0000 (Mon, 09 May 2011)

Log Message:
-----------
eclipse support for their channeling - comment out till I get it working 100%

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-09 02:07:46 UTC (rev 14944)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-09 02:22:31 UTC (rev 14945)
@@ -3893,14 +3893,14 @@
 								<xsl:call-template name="eclipse_channeling.info">
 									<xsl:with-param name="title" select="'Magnitude'"/>
 									<xsl:with-param name="info" select="damage" />
-										<xsl:choose>
+<!-- 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:choose>-->
 									<xsl:with-param name="info" select="damage_bonus" />
 								</xsl:call-template>
 								<xsl:call-template name="eclipse_channeling.info">


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

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

Log Message:
-----------
Header Block now includes -
* Age (With Birthdate)
* Class (Archetypes if chosen) - Lengthened Class Line
* Exp / Next Level in one block
* Vision now shows "Normal" if no other Vision is present
* Points won't display "0" 
Issue#: OS-79

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-12 18:12:38 UTC (rev 14965)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-12 19:39:41 UTC (rev 14966)
@@ -519,7 +519,7 @@
 						</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
-					<fo:table-cell padding-top="2.5pt" number-columns-spanned="3">
+					<fo:table-cell padding-top="2.5pt" number-columns-spanned="1">
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'bio'"/>
 						</xsl:call-template>
@@ -528,6 +528,16 @@
 						</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
+					<fo:table-cell padding-top="2.5pt" number-columns-spanned="1">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'bio'"/>
+						</xsl:call-template>
+						<fo:block font-size="8pt">
+							<xsl:value-of select="region"/>
+						</fo:block>
+					</fo:table-cell>
+
+					<fo:table-cell/>
 					<fo:table-cell padding-top="2.5pt">
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'bio'"/>
@@ -556,23 +566,30 @@
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'bio.title'"/>
 						</xsl:call-template>
-						<fo:block font-size="6pt" padding-top="1pt">NAME</fo:block>
+						<fo:block font-size="6pt" padding-top="1pt">CHARACTER NAME</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
 					<fo:table-cell number-columns-spanned="3">
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'bio.title'"/>
 						</xsl:call-template>
-						<fo:block font-size="6pt" padding-top="1pt">PLAYERNAME</fo:block>
+						<fo:block font-size="6pt" padding-top="1pt">PLAYER NAME</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
-					<fo:table-cell number-columns-spanned="3">
+					<fo:table-cell number-columns-spanned="1">
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'bio.title'"/>
 						</xsl:call-template>
 						<fo:block font-size="6pt" padding-top="1pt">DEITY</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
+					<fo:table-cell number-columns-spanned="1">
+						<xsl:call-template name="attrib">
+							<xsl:with-param name="attribute" select="'bio.title'"/>
+						</xsl:call-template>
+						<fo:block font-size="6pt" padding-top="1pt">REGION</fo:block>
+					</fo:table-cell>
+					<fo:table-cell/>
 					<fo:table-cell>
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'bio.title'"/>
@@ -582,24 +599,40 @@
 					<fo:table-cell/>
 				</fo:table-row>
 				<fo:table-row>
-					<fo:table-cell>
+					<fo:table-cell number-columns-spanned="3">
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'bio'"/>
 						</xsl:call-template>
-						<fo:block font-size="8pt" padding-top="3pt">
+<!-->						<fo:block font-size="8pt" padding-top="3pt">
 							<xsl:value-of select="classes/shortform"/>
-						</fo:block>
-					</fo:table-cell>
-					<fo:table-cell/>
-					<fo:table-cell>
-						<xsl:call-template name="attrib">
-							<xsl:with-param name="attribute" select="'bio'"/>
-						</xsl:call-template>
+						</fo:block>-->
 						<fo:block font-size="8pt" padding-top="3pt">
-							<xsl:value-of select="experience/current"/>
+							<xsl:variable name = "classcount" ><xsl:value-of select="count(classes/class)"/></xsl:variable>
+							<xsl:for-each select = "classes/class">
+								<xsl:sort select="sequence"/>
+								<xsl:variable name="classname">
+									<xsl:value-of select="translate(name, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+								</xsl:variable>
+								<xsl:variable name="archetypecount">
+									<xsl:value-of select="count(/character/basics/archetypes/archetype[contains(type,$classname)])"/>
+								</xsl:variable>
+								<xsl:value-of select="name"/>
+									<xsl:if test="$archetypecount &gt; 0">
+										<xsl:text> (</xsl:text>
+										<xsl:for-each select="/character/basics/archetypes/archetype[contains(type,$classname)]">
+										<xsl:value-of select="name"/>
+										<xsl:if test="position() &lt; $archetypecount">, </xsl:if>
+											</xsl:for-each>
+											<xsl:text>)</xsl:text>
+									</xsl:if>
+									<xsl:text> </xsl:text>
+									<xsl:value-of select="level"/>
+									<xsl:if test="position() &lt; $classcount">, </xsl:if>
+							</xsl:for-each>
 						</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
+
 					<fo:table-cell>
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'bio'"/>
@@ -640,29 +673,25 @@
 						</xsl:call-template>
 						<fo:block font-size="8pt" padding-top="3pt">
 							<xsl:value-of select="vision/all"/>
+							<xsl:if test="vision/all = ''">Normal</xsl:if>
 						</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
 				</fo:table-row>
 				<fo:table-row>
-					<fo:table-cell>
+					<fo:table-cell number-columns-spanned="3">
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'bio.title'"/>
 						</xsl:call-template>
 						<fo:block font-size="6pt" padding-top="1pt">CLASS</fo:block>
 					</fo:table-cell>
+					
+				
 					<fo:table-cell/>
 					<fo:table-cell>
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'bio.title'"/>
 						</xsl:call-template>
-						<fo:block font-size="6pt" padding-top="1pt">EXPERIENCE</fo:block>
-					</fo:table-cell>
-					<fo:table-cell/>
-					<fo:table-cell>
-						<xsl:call-template name="attrib">
-							<xsl:with-param name="attribute" select="'bio.title'"/>
-						</xsl:call-template>
 						<fo:block font-size="6pt" padding-top="1pt">RACE</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
@@ -712,7 +741,7 @@
 							<xsl:with-param name="attribute" select="'bio'"/>
 						</xsl:call-template>
 						<fo:block font-size="8pt" padding-top="3pt">
-							<xsl:value-of select="experience/next_level"/>
+							<xsl:value-of select="experience/current"/> / <xsl:value-of select="experience/next_level"/>
 						</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
@@ -722,6 +751,7 @@
 						</xsl:call-template>
 						<fo:block font-size="8pt" padding-top="3pt">
 							<xsl:value-of select="age"/>
+							<xsl:if test="birthday != ''"> (<xsl:value-of select="birthday"/>)</xsl:if>
 						</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
@@ -748,7 +778,8 @@
 							<xsl:with-param name="attribute" select="'bio'"/>
 						</xsl:call-template>
 						<fo:block font-size="8pt" padding-top="3pt">
-							<xsl:value-of select="hair/color"/>, <xsl:value-of select="hair/length"/>
+							<xsl:value-of select="hair/color"/>
+								<xsl:if test="hair/color != '' and hair/length !=''">, <xsl:value-of select="hair/length"/></xsl:if>
 						</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
@@ -757,7 +788,7 @@
 							<xsl:with-param name="attribute" select="'bio'"/>
 						</xsl:call-template>
 						<fo:block font-size="8pt" padding-top="3pt">
-							<xsl:value-of select="poolpoints/cost"/>
+							<xsl:if test="poolpoints/cost &gt; 0"> <xsl:value-of select="poolpoints/cost"/> </xsl:if>
 						</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
@@ -779,7 +810,7 @@
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'bio.title'"/>
 						</xsl:call-template>
-						<fo:block font-size="6pt" padding-top="1pt">NEXT LEVEL</fo:block>
+						<fo:block font-size="6pt" padding-top="1pt">EXP  /   NEXT LEVEL</fo:block>
 					</fo:table-cell>
 					<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: 14973
          http://pcgen.svn.sourceforge.net/pcgen/?rev=14973&view=rev
Author:   amaitland
Date:     2011-05-12 22:59:33 +0000 (Thu, 12 May 2011)

Log Message:
-----------
Fix some display issues and typos 
Issue#: OS-79

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-12 22:13:05 UTC (rev 14972)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-12 22:59:33 UTC (rev 14973)
@@ -1148,7 +1148,7 @@
 					</fo:table-cell>
 					<fo:table-cell/>
 					<fo:table-cell>
-						<fo:block text-align="center" font-size="4pt">ABILTIY DAMAGE</fo:block>
+						<fo:block text-align="center" font-size="4pt">ABILITY DAMAGE</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
 					<fo:table-cell>
@@ -1178,11 +1178,12 @@
 							</fo:block>
 						</fo:table-cell>
 						<fo:table-cell/>
-						<xsl:call-template name="attrib">
-								<xsl:with-param name="attribute" select="'stat.base.modifier'"/>
-							</xsl:call-template>
+					
 						<xsl:if test="no_temp_score != base">
 							<fo:table-cell>
+								<xsl:call-template name="attrib">
+									<xsl:with-param name="attribute" select="'stat.base.score'"/>
+								</xsl:call-template>
 								<fo:block space-before.optimum="2pt" font-size="10pt">
 									<xsl:value-of select="no_temp_score"/>
 								</fo:block>
@@ -1790,11 +1791,11 @@
 					</fo:table-cell>
 					<fo:table-cell/>
 					<fo:table-cell>
-						<fo:block text-align="center" font-size="4pt">NATURAL ARMOR</fo:block>
+						<fo:block text-align="center" font-size="3pt">NATURAL ARMOR</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
 					<fo:table-cell>
-						<fo:block text-align="center" font-size="4pt">DEFLEC- TION</fo:block>
+						<fo:block text-align="center" font-size="3pt">DEFLEC- TION</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
 					<fo:table-cell>
@@ -2348,7 +2349,7 @@
 						</xsl:call-template>
 						<fo:block font-size="4pt">conditional modifiers</fo:block>
 						<fo:block font-size="4pt">
-							<xsl:value-of select="conditional_modifiers"/>
+							<xsl:value-of select="conditional_modifiers/"/>
 						</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: 14974
          http://pcgen.svn.sourceforge.net/pcgen/?rev=14974&view=rev
Author:   amaitland
Date:     2011-05-12 23:10:14 +0000 (Thu, 12 May 2011)

Log Message:
-----------
fix error

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-12 22:59:33 UTC (rev 14973)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-05-12 23:10:14 UTC (rev 14974)
@@ -2347,9 +2347,9 @@
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'border'"/>
 						</xsl:call-template>
-						<fo:block font-size="4pt">conditional modifiers</fo:block>
+						<fo:block font-size="4pt">Conditional Modifiers</fo:block>
 						<fo:block font-size="4pt">
-							<xsl:value-of select="conditional_modifiers/"/>
+							<xsl:value-of select="conditional_modifiers"/>
 						</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: 15571
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15571&view=rev
Author:   amaitland
Date:     2011-11-28 17:28:35 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
fantasy d20 master sheet uses deflection twice instead of dodge

Issue#: OS-147

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-11-28 14:03:10 UTC (rev 15570)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2011-11-28 17:28:35 UTC (rev 15571)
@@ -1724,7 +1724,7 @@
 							<xsl:with-param name="attribute" select="'ac'"/>
 						</xsl:call-template>
 						<fo:block font-size="10pt">
-							<xsl:value-of select="deflection"/>
+							<xsl:value-of select="dodge"/>
 						</fo:block>
 					</fo:table-cell>
 					<fo:table-cell display-align="center">

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

Revision: 15882
          http://pcgen.svn.sourceforge.net/pcgen/?rev=15882&view=rev
Author:   amaitland
Date:     2012-01-23 03:02:39 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Double weapon 'Two Handed' text doesn't fit into the 'Hands' field on weapon display
Issue#: OS-68

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-01-22 21:37:34 UTC (rev 15881)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-01-23 03:02:39 UTC (rev 15882)
@@ -3396,9 +3396,18 @@
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'weapon'"/>
 						</xsl:call-template>
+					<xsl:choose>
+						<xsl:when test="string-length(hand) &lt; 9">
 						<fo:block font-size="7pt">
 							<xsl:value-of select="hand"/>
 						</fo:block>
+						</xsl:when>
+						<xsl:otherwise>
+							<fo:block font-size="5pt">
+								<xsl:value-of select="hand"/>
+							</fo:block>
+						</xsl:otherwise>
+					</xsl:choose>
 					</fo:table-cell>
 					<fo:table-cell>
 						<xsl:call-template name="attrib">
@@ -4093,8 +4102,7 @@
 		<xsl:variable name="channel_intensity">
 			<xsl:value-of select="/channel_intensity"/>
 		</xsl:variable>
-	<!--/character/eclipse_channeling	../character/eclipse_channeling/channel_intensity/>	-->
-		<!-- BEGIN Turning Table -->
+		<!-- BEGIN Channeling 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>
 			<xsl:call-template name="attrib"><xsl:with-param name="attribute" select="'turning.border'"/></xsl:call-template>

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

Revision: 16107
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16107&view=rev
Author:   amaitland
Date:     2012-02-07 22:45:01 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Add 'level' after character name on every page's footer.
Issue#: OS-160

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-02-07 21:42:49 UTC (rev 16106)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-02-07 22:45:01 UTC (rev 16107)
@@ -217,7 +217,7 @@
 			<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"/></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"/>]</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">
@@ -737,7 +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"/>
+							/ <xsl:value-of select="cr"/>
 						</fo:block>
 					</fo:table-cell>
 					<fo:table-cell/>
@@ -966,7 +966,7 @@
 
 		For now, just make it 3 weapons max.
 		-->
-		<xsl:value-of select="3"/>
+		<xsl:value-of select="4"/>
 	</xsl:template>
 	<!--
 ====================================
@@ -3457,6 +3457,7 @@
 	TEMPLATE - weapons - special properties
 ====================================
 ====================================-->
+	
 	<xsl:template match="common" mode="special_properties">
 		<xsl:param name="column_width" select="0.55 * $pagePrintableWidth - 2"/>
 		<fo:table table-layout="fixed" keep-with-next="always" keep-together="always">
@@ -3466,6 +3467,7 @@
 			</fo:table-column>
 			<fo:table-body>
 				<fo:table-row keep-with-next.within-column="always">
+				<xsl:if test="special_properties != ''">
 					<fo:table-cell>
 						<xsl:call-template name="attrib">
 							<xsl:with-param name="attribute" select="'weapon.title'"/>
@@ -3480,10 +3482,12 @@
 							<xsl:value-of select="special_properties"/>
 						</fo:block>
 					</fo:table-cell>
+				</xsl:if>
 				</fo:table-row>
 			</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: 16108
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16108&view=rev
Author:   amaitland
Date:     2012-02-07 22:50:33 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
roll back Weapons to '3'

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-02-07 22:45:01 UTC (rev 16107)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-02-07 22:50:33 UTC (rev 16108)
@@ -966,7 +966,7 @@
 
 		For now, just make it 3 weapons max.
 		-->
-		<xsl:value-of select="4"/>
+		<xsl:value-of select="3"/>
 	</xsl:template>
 	<!--
 ====================================

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

Revision: 16411
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16411&view=rev
Author:   amaitland
Date:     2012-03-02 03:26:37 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
Implement new Portrait Thumb view for Preview and OS files
Issue#: OS-167

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-02 00:46:32 UTC (rev 16410)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-02 03:26:37 UTC (rev 16411)
@@ -556,7 +556,7 @@
 								<xsl:with-param name="attribute" select="'picture'"/>
 							</xsl:call-template>
 							<fo:block>
-								<xsl:variable name="portrait_file" select="/character/basics/portrait/portrait_thumb"/>
+								<xsl:variable name="portrait_file" select="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>

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

Revision: 16593
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16593&view=rev
Author:   amaitland
Date:     2012-03-23 18:58:56 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Backport a few improvements to the fantasy_master_std.xslt from alternate sheet.

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-23 18:44:40 UTC (rev 16592)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-23 18:58:56 UTC (rev 16593)
@@ -217,15 +217,17 @@
 			<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"/> / 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:block font-size="5pt">Character: <fo:inline font-weight="bold"><xsl:value-of select="/character/basics/name"/></fo:inline></fo:block>
+						<fo:block font-size="5pt">Player: <fo:inline font-weight="bold"><xsl:value-of select="/character/basics/playername"/></fo:inline></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">PCGen Character Template by Frugal, based on work by ROG, Arcady, Barak, Dimrill, Dekker &amp; Andrew Maitland (LegacyKing).</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/>
+						<fo:block font-size="5pt">
+						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">Page <fo:page-number/>
 						</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: 16594
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16594&view=rev
Author:   amaitland
Date:     2012-03-24 06:11:29 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
Bomb ranges now display;
TODO: Need to get the leading + to display; can't have the ASPECT with a + or it breaks the display.

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-23 18:58:56 UTC (rev 16593)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-24 06:11:29 UTC (rev 16594)
@@ -3203,7 +3203,7 @@
 							<xsl:with-param name="attribute" select="'weapon.title'"/>
 						</xsl:call-template>
 				<xsl:choose>
-					<xsl:when test="range &gt; 0">
+					<xsl:when test="(range) &gt; 0">
 						<fo:block font-size="6pt">RANGE</fo:block>
 					</xsl:when>
 					<xsl:otherwise>
@@ -3214,6 +3214,7 @@
 				</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'"/>
@@ -3244,7 +3245,7 @@
 						</xsl:call-template>
 						<fo:block font-size="8pt">
 						<xsl:choose>
-							<xsl:when test="range &gt; 0">
+							<xsl:when test="(range) &gt; 0">
 								<xsl:value-of select="range"/>
 								<xsl:value-of select="distance_unit"/>
 							</xsl:when>
@@ -3311,127 +3312,134 @@
 	</xsl:template>
 
 	<xsl:template name="range.distance.thrown">
+		<xsl:param name="column_width" select="0.55 * $pagePrintableWidth - 2"/>
 		<xsl:param name="distance"/>
-		<xsl:param name="tohit"/>
 		<xsl:param name="damage"/>
+		<xsl:param name="tohit" select="''"/>
 			<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-column column-width="5mm"/>
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.2 * ($column_width - 5)" />mm</xsl:attribute>
+			</fo:table-column>
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.2 * ($column_width - 5)" />mm</xsl:attribute>
+			</fo:table-column>
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.2 * ($column_width - 5)" />mm</xsl:attribute>
+			</fo:table-column>
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.2 * ($column_width - 5)" />mm</xsl:attribute>
+			</fo:table-column>
+			<fo:table-column>
+				<xsl:attribute name="column-width"><xsl:value-of select="0.2 * ($column_width - 5)" />mm</xsl:attribute>
+			</fo:table-column>
 			<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 font-size="7pt" padding-right="2pt">
+									Rng
 								</fo:block>
 							</fo:table-cell>
-						<xsl:for-each select="range">
+					<!-->	<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:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
-								<fo:block font-size="8pt" padding-right="2pt">
+								<fo:block font-size="7pt" padding-right="2pt">
 									<xsl:value-of select="number($distance)"/>
-									<xsl:value-of select="distance_unit"/> / 
-									<xsl:value-of select="$tohit"/>
+									<xsl:value-of select="distance_unit"/>
 								</fo:block>
 							</fo:table-cell>
-						</xsl:for-each>
+				<!-->		</xsl:for-each> -->
 							<!-- 2nd -->
-<!-->							<fo:table-cell padding-top="2pt" padding-bottom="2pt" padding-left="2pt">
+							<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:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
-								<fo:block font-size="8pt" padding-right="2pt">
-									<xsl:value-of select="range*2"/>
+								<fo:block font-size="7pt" padding-right="2pt">
+									<xsl:value-of select="$distance*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:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
-								<fo:block font-size="8pt" padding-right="2pt">
-									<xsl:value-of select="range*3"/>
+								<fo:block font-size="7pt" padding-right="2pt">
+									<xsl:value-of select="$distance*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:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
-								<fo:block font-size="8pt" padding-right="2pt">
-									<xsl:value-of select="range*4"/>
+								<fo:block font-size="7pt" padding-right="2pt">
+									<xsl:value-of select="$distance*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:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
-								<fo:block font-size="8pt" padding-right="2pt">
-									<xsl:value-of select="range*5"/>
+								<fo:block font-size="7pt" padding-right="2pt">
+									<xsl:value-of select="$distance*5"/>
 									<xsl:value-of select="distance_unit"/>
 								</fo:block>
-							</fo:table-cell>-->
+							</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 font-size="7pt" padding-right="2pt">
+									TH
 								</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:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
-								<fo:block font-size="8pt" padding-right="2pt">
-									<xsl:value-of select="tohit"/>
+								<fo:block font-size="7pt" 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:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
-								<fo:block font-size="8pt" padding-right="2pt">
-									<xsl:value-of select="tohit"/>
-									
+								<fo:block font-size="7pt" padding-right="2pt">
+									<xsl:value-of select="number($tohit)-2"/>
 								</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:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
-								<fo:block font-size="8pt" padding-right="2pt">
-									<xsl:value-of select="tohit"/>
+								<fo:block font-size="7pt" padding-right="2pt">
+									<xsl:value-of select="number($tohit)-4"/>
 								</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:with-param name="attribute" select="'weapon.title'"/>
 							</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 font-size="7pt" padding-right="2pt">
+									<xsl:value-of select="number($tohit)-6"/>
 								</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:with-param name="attribute" select="'weapon.title'"/>
 							</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 font-size="7pt" padding-right="2pt">
+									<xsl:value-of select="($tohit)-8"/>
 								</fo:block>
 							</fo:table-cell>
 							</fo:table-row>
@@ -3440,23 +3448,24 @@
 						</xsl:template>
 
 						<xsl:template name="range.ranged">
+								<xsl:param name="distance"/>
+								<xsl:param name="damage"/>
+								<xsl:param name="tohit" select="''"/>
 							<fo:table-cell number-columns-spanned="1">
 								<xsl:call-template name="attrib">
-									<xsl:with-param name="attribute" select="'weapon.border'"/>
+									<xsl:with-param name="attribute" select="'weapon.title'"/>
 								</xsl:call-template>
 								<fo:block font-size="8pt" padding-right="2pt">
-									<xsl:value-of select="range*6"/>
+									<xsl:value-of select="$distance*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:with-param name="attribute" select="'weapon.title'"/>
 								</xsl:call-template>
 								<fo:block font-size="8pt" padding-right="2pt">
-									<xsl:value-of select="range*7"/>
+									<xsl:value-of select="$distance*7"/>
 									<xsl:value-of select="distance_unit"/>
 								</fo:block>
 							</fo:table-cell>

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

Revision: 16597
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16597&view=rev
Author:   amaitland
Date:     2012-03-24 06:43:52 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
Add conditional '+' to Bomb/Natural Attacks.

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-24 06:43:10 UTC (rev 16596)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-03-24 06:43:52 UTC (rev 16597)
@@ -3220,6 +3220,7 @@
 							<xsl:with-param name="attribute" select="'weapon.hilight'"/>
 						</xsl:call-template>
 						<fo:block font-size="8pt">
+						<xsl:if test="tohit &gt; 0">+</xsl:if>
 							<xsl:value-of select="tohit"/>
 						</fo:block>
 					</fo:table-cell>
@@ -3406,6 +3407,7 @@
 									<xsl:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
 								<fo:block font-size="7pt" padding-right="2pt">
+									<xsl:if test="($tohit) &gt; 0">+</xsl:if>
 									<xsl:value-of select="$tohit"/>
 								</fo:block>
 							</fo:table-cell>
@@ -3415,6 +3417,7 @@
 									<xsl:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
 								<fo:block font-size="7pt" padding-right="2pt">
+								<xsl:if test="($tohit)-2 &gt; 0">+</xsl:if>
 									<xsl:value-of select="number($tohit)-2"/>
 								</fo:block>
 							</fo:table-cell>
@@ -3423,6 +3426,7 @@
 									<xsl:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
 								<fo:block font-size="7pt" padding-right="2pt">
+								<xsl:if test="($tohit)-4 &gt; 0">+</xsl:if>
 									<xsl:value-of select="number($tohit)-4"/>
 								</fo:block>
 							</fo:table-cell>
@@ -3431,6 +3435,7 @@
 									<xsl:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
 								<fo:block font-size="7pt" padding-right="2pt">
+								<xsl:if test="($tohit)-6 &gt; 0">+</xsl:if>
 									<xsl:value-of select="number($tohit)-6"/>
 								</fo:block>
 							</fo:table-cell>
@@ -3439,6 +3444,7 @@
 									<xsl:with-param name="attribute" select="'weapon.title'"/>
 							</xsl:call-template>
 								<fo:block font-size="7pt" padding-right="2pt">
+									<xsl:if test="($tohit)-8 &gt; 0">+</xsl:if>
 									<xsl:value-of select="($tohit)-8"/>
 								</fo:block>
 							</fo:table-cell>

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

Revision: 16697
          http://pcgen.svn.sourceforge.net/pcgen/?rev=16697&view=rev
Author:   jdempsey
Date:     2012-05-05 22:09:43 +0000 (Sat, 05 May 2012)
Log Message:
-----------
Add encoding

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-05-05 21:44:19 UTC (rev 16696)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-05-05 22:09:43 UTC (rev 16697)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id$ -->
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

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

Revision: 17326
          http://pcgen.svn.sourceforge.net/pcgen/?rev=17326&view=rev
Author:   amaitland
Date:     2012-09-17 17:25:15 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------

Fix Thrown Weapons to have full 5 Range Increments
Issue#: OS-191

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-09-17 16:45:35 UTC (rev 17325)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-09-17 17:25:15 UTC (rev 17326)
@@ -3958,7 +3958,11 @@
 						</fo:table-cell>
 					</fo:table-row>
 				</xsl:if>
-				<xsl:if test="range[position() &gt; 5 or ../../common/range &gt; 10]">	
+				<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]">	
@@ -3988,8 +3992,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 -->
@@ -4102,15 +4109,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">
@@ -4125,7 +4132,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">
@@ -4155,6 +4162,67 @@
 						</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: 17345
          http://pcgen.svn.sourceforge.net/pcgen/?rev=17345&view=rev
Author:   amaitland
Date:     2012-09-18 16:51:33 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Add missing <xsl:choose> to file.

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-09-18 16:18:10 UTC (rev 17344)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-09-18 16:51:33 UTC (rev 17345)
@@ -3958,6 +3958,7 @@
 						</fo:table-cell>
 					</fo:table-row>
 				</xsl:if>
+				<xsl:choose>
 				<xsl:when test="range[position()=11 and distance='']">
 				</xsl:when>
 				<xsl:otherwise>

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

Revision: 17346
          http://pcgen.svn.sourceforge.net/pcgen/?rev=17346&view=rev
Author:   amaitland
Date:     2012-09-18 16:58:05 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Add missing section to Prevent 30' Short Range from appearing if not needed.

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-09-18 16:51:33 UTC (rev 17345)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-09-18 16:58:05 UTC (rev 17346)
@@ -3959,6 +3959,8 @@
 					</fo:table-row>
 				</xsl:if>
 				<xsl:choose>
+				<xsl:when test="range[position()=6 and distance='']">
+				</xsl:when>
 				<xsl:when test="range[position()=11 and distance='']">
 				</xsl:when>
 				<xsl:otherwise>

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

Revision: 18035
          http://pcgen.svn.sourceforge.net/pcgen/?rev=18035&view=rev
Author:   amaitland
Date:     2012-10-27 08:06:21 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
Fix missing end tag.

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

Modified: Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt
===================================================================
--- Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-10-27 06:15:02 UTC (rev 18034)
+++ Trunk/pcgen/outputsheets/d20/fantasy/pdf/fantasy_master_std.xslt	2012-10-27 08:06:21 UTC (rev 18035)
@@ -5428,8 +5428,9 @@
 			<xsl:with-param name="followerType" select="'Familiar'"/>
 		</xsl:call-template>
 		<!-- END Familiar Table -->
+	</xsl:template>
 	<xsl:template match="psicrystal">
-		<!-- BEGIN Familiar Table -->
+		<!-- BEGIN Psicrystal Table -->
 		<xsl:call-template name="show_companion">
 			<xsl:with-param name="followerType" select="'Psicrystal'"/>
 		</xsl:call-template>
@@ -5491,7 +5492,7 @@
 			<fo:table-column column-width="14mm"/>
 			<fo:table-column column-width="13mm"/>
 			<fo:table-column column-width="14mm"/>
-			<fo:table-body keep-together="column">
+			<fo:table-body keep-together="always">
 				<fo:table-row>
 					<fo:table-cell number-columns-spanned="6">
 						<xsl:call-template name="attrib">

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