[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] (no subject)
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] (no subject) |
|
Date: |
Thu, 28 Jul 2016 11:02:34 +0000 (UTC) |
branch: master
commit cc39acff51c64801fcc662ccc591adcc31d30f07
Author: Gregory W. Chicares <address@hidden>
Date: Fri Jul 22 22:07:56 2016 +0000
Fix defect introduced 20070521T1306Z: incorrect XSL
Apparently this defect was introduced in 2007, and then propagated to
another file on 20081220T1903. See:
https://lists.nongnu.org/archive/html/lmi/2009-05/msg00026.html
---
reg_d_individual.xsl | 242 ++++++++++++++++++++++++++------------------------
variable_annuity.xsl | 42 ++++-----
2 files changed, 146 insertions(+), 138 deletions(-)
diff --git a/reg_d_individual.xsl b/reg_d_individual.xsl
index a70cc7b..8f07798 100644
--- a/reg_d_individual.xsl
+++ b/reg_d_individual.xsl
@@ -577,26 +577,28 @@
<xsl:param name="displaycontractlanguage"/>
<xsl:param name="displaydisclaimer"/>
<xsl:param name="logo_only"/>
- <fo:table table-layout="fixed" width="100%" padding-after="2.5pt"
font-weight="bold" font-size="13.0pt" font-family="sans-serif">
- <fo:table-column column-width="50mm"/>
- <fo:table-column column-width="90mm"/>
- <fo:table-column column-width="50mm"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell>
- <fo:block text-align="left">
- <xsl:call-template name="company-logo"/>
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block/>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block/>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
+ <fo:block padding-after="2.5pt">
+ <fo:table table-layout="fixed" width="100%" font-weight="bold"
font-size="13.0pt" font-family="sans-serif">
+ <fo:table-column column-width="50mm"/>
+ <fo:table-column column-width="90mm"/>
+ <fo:table-column column-width="50mm"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block text-align="left">
+ <xsl:call-template name="company-logo"/>
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block/>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block/>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
<fo:block text-align="center" font-size="9pt">
<xsl:if test="$displaycontractlanguage=1">
<fo:block padding-top="1em">
@@ -622,97 +624,99 @@
</xsl:if>
</fo:block>
- <fo:table table-layout="fixed" width="100%" padding-top="1em">
- <fo:table-column column-width="125mm"/>
- <fo:table-column column-width="proportional-column-width(1)"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell padding-right="2mm">
- <fo:block text-align="left" font-size="9pt">
- <fo:block>
- Date Prepared: <xsl:call-template name="date-prepared"/>
- </fo:block>
- <fo:block>
- <xsl:choose>
- <xsl:when test="$is_composite">
- Composite of individuals
- </xsl:when>
- <xsl:otherwise>
- Prepared for:
- <xsl:call-template name="limitstring">
- <xsl:with-param name="passString"
select="$scalars/Insured1"/>
- <xsl:with-param name="length" select="30"/>
- </xsl:call-template>
- </xsl:otherwise>
- </xsl:choose>
- </fo:block>
- <xsl:if test="not($is_composite)">
- <fo:block>
- Age: <xsl:value-of select="$scalars/Age"/>
- </fo:block>
- </xsl:if>
- <xsl:if test="not($is_composite)">
+ <fo:block padding-top="1em">
+ <fo:table table-layout="fixed" width="100%">
+ <fo:table-column column-width="125mm"/>
+ <fo:table-column column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell padding-right="2mm">
+ <fo:block text-align="left" font-size="9pt">
<fo:block>
- Issue State: <xsl:value-of
select="$scalars/StatePostalAbbrev"/>
+ Date Prepared: <xsl:call-template name="date-prepared"/>
</fo:block>
- </xsl:if>
- <fo:block>
- Selected Face Amount:
- $<xsl:value-of select="$scalars/InitTotalSA"/>
- </fo:block>
- <fo:block>
- Initial Death Benefit Option:
- <xsl:value-of select="$scalars/InitDBOpt"/>
- </fo:block>
- </fo:block>
- </fo:table-cell>
-
- <fo:table-cell>
- <fo:block text-align="left" font-size="9pt">
- <fo:block>
- Policy: <xsl:value-of select="$scalars/PolicyMktgName"/>
- </fo:block>
- <fo:block/>
- <xsl:if test="not($is_composite)">
<fo:block>
- Underwriting Type:
<xsl:choose>
- <xsl:when test="$scalars/UWType='Medical'">
- Fully underwritten
+ <xsl:when test="$is_composite">
+ Composite of individuals
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="$scalars/UWType"/>
+ Prepared for:
+ <xsl:call-template name="limitstring">
+ <xsl:with-param name="passString"
select="$scalars/Insured1"/>
+ <xsl:with-param name="length" select="30"/>
+ </xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</fo:block>
+ <xsl:if test="not($is_composite)">
+ <fo:block>
+ Age: <xsl:value-of select="$scalars/Age"/>
+ </fo:block>
+ </xsl:if>
+ <xsl:if test="not($is_composite)">
+ <fo:block>
+ Issue State: <xsl:value-of
select="$scalars/StatePostalAbbrev"/>
+ </fo:block>
+ </xsl:if>
+ <fo:block>
+ Selected Face Amount:
+ $<xsl:value-of select="$scalars/InitTotalSA"/>
+ </fo:block>
<fo:block>
- Rate Classification: <xsl:value-of
select="$scalars/Gender"/>,
- <xsl:value-of select="$scalars/Smoker"/>,
- <xsl:value-of select="$scalars/UWClass"/>
+ Initial Death Benefit Option:
+ <xsl:value-of select="$scalars/InitDBOpt"/>
</fo:block>
- <xsl:if test="$scalars/UWClass='Rated'">
- <fo:block padding-left="3em">
- <fo:block>
- Table Rating:
- <xsl:value-of select="$scalars/SubstandardTable"/>
- </fo:block>
- <!-- Flats don't require "Rated" class; and does this
value actually print anyway?
- These questions apply as well to the original:
-
http://svn.savannah.nongnu.org/viewvc/lmi/trunk/individual_private_placement.xsl?annotate=696&root=lmi&pathrev=3585
- -->
- <fo:block>
- Initial Annual Flat Extra:
- <xsl:value-of
select="address@hidden'AnnualFlatExtra']/duration[1]/@column_value"/>
- per 1,000
- </fo:block>
+ </fo:block>
+ </fo:table-cell>
+
+ <fo:table-cell>
+ <fo:block text-align="left" font-size="9pt">
+ <fo:block>
+ Policy: <xsl:value-of select="$scalars/PolicyMktgName"/>
+ </fo:block>
+ <fo:block/>
+ <xsl:if test="not($is_composite)">
+ <fo:block>
+ Underwriting Type:
+ <xsl:choose>
+ <xsl:when test="$scalars/UWType='Medical'">
+ Fully underwritten
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$scalars/UWType"/>
+ </xsl:otherwise>
+ </xsl:choose>
</fo:block>
+ <fo:block>
+ Rate Classification: <xsl:value-of
select="$scalars/Gender"/>,
+ <xsl:value-of select="$scalars/Smoker"/>,
+ <xsl:value-of select="$scalars/UWClass"/>
+ </fo:block>
+ <xsl:if test="$scalars/UWClass='Rated'">
+ <fo:block padding-left="3em">
+ <fo:block>
+ Table Rating:
+ <xsl:value-of select="$scalars/SubstandardTable"/>
+ </fo:block>
+ <!-- Flats don't require "Rated" class; and does this
value actually print anyway?
+ These questions apply as well to the original:
+
http://svn.savannah.nongnu.org/viewvc/lmi/trunk/individual_private_placement.xsl?annotate=696&root=lmi&pathrev=3585
+ -->
+ <fo:block>
+ Initial Annual Flat Extra:
+ <xsl:value-of
select="address@hidden'AnnualFlatExtra']/duration[1]/@column_value"/>
+ per 1,000
+ </fo:block>
+ </fo:block>
+ </xsl:if>
</xsl:if>
- </xsl:if>
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
<fo:block text-align="left" font-size="9pt" font-family="sans-serif">
<xsl:call-template name="print-mastercontractnumber-and-contractnumber"/>
@@ -721,26 +725,28 @@
<xsl:template name="plain-header">
<xsl:param name="logo_only"/>
- <fo:table table-layout="fixed" width="100%" padding-after="2.5pt"
font-weight="bold" font-size="13.0pt" font-family="sans-serif">
- <fo:table-column column-width="50mm"/>
- <fo:table-column column-width="90mm"/>
- <fo:table-column column-width="50mm"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell>
- <fo:block text-align="left">
- <xsl:call-template name="company-logo"/>
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block/>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block/>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
+ <fo:block padding-after="2.5pt">
+ <fo:table table-layout="fixed" width="100%" font-weight="bold"
font-size="13.0pt" font-family="sans-serif">
+ <fo:table-column column-width="50mm"/>
+ <fo:table-column column-width="90mm"/>
+ <fo:table-column column-width="50mm"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block text-align="left">
+ <xsl:call-template name="company-logo"/>
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block/>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block/>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
</xsl:template>
<xsl:template name="irr-guaranteed-illustration-report">
diff --git a/variable_annuity.xsl b/variable_annuity.xsl
index 476f797..61c2aee 100644
--- a/variable_annuity.xsl
+++ b/variable_annuity.xsl
@@ -706,26 +706,28 @@
<xsl:template name="standard-header">
<xsl:param name="logo_only"/>
- <fo:table table-layout="fixed" width="100%" padding-after="2.5pt"
font-weight="bold" font-size="13.0pt" font-family="sans-serif">
- <fo:table-column column-width="50mm"/>
- <fo:table-column column-width="90mm"/>
- <fo:table-column column-width="50mm"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell>
- <fo:block text-align="left">
- <xsl:call-template name="company-logo"/>
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block/>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block/>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
+ <fo:block padding-after="2.5pt">
+ <fo:table table-layout="fixed" width="100%" font-weight="bold"
font-size="13.0pt" font-family="sans-serif">
+ <fo:table-column column-width="50mm"/>
+ <fo:table-column column-width="90mm"/>
+ <fo:table-column column-width="50mm"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block text-align="left">
+ <xsl:call-template name="company-logo"/>
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block/>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block/>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
<xsl:if test="not($logo_only)">
<fo:block font-weight="bold" font-size="14pt" font-family="sans-serif"
text-align="center" padding-top="1em">
<xsl:value-of select="$scalars/PolicyMktgName"/>