[lmi-commits] [lmi] master a9dfdd7 3/4: Fix "Superheader width exceeds available" for indiv PP, properly

[Greg Chicares]

branch: master
commit a9dfdd7317b7decd959d335d08327326c5302c0f
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Fix "Superheader width exceeds available" for indiv PP, properly
    
    Now double-digit interest rates can be illustrated, and the current and
    guaranteed superheaders span the appropriate columns. Flattening the
    superheaders made it necessary to add a line break above, after
    {{>dollar_units}}.
---
 pdf_command_wx.cpp       | 14 ++++++--------
 reg_d_indiv_curr.mst     |  1 +
 reg_d_indiv_curr_irr.mst |  1 +
 reg_d_indiv_guar_irr.mst |  1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pdf_command_wx.cpp b/pdf_command_wx.cpp
index cdd83b9..15562d5 100644
--- a/pdf_command_wx.cpp
+++ b/pdf_command_wx.cpp
@@ -2989,15 +2989,14 @@ class reg_d_indiv_irr_base : public 
page_with_tabular_report
             << "{{InitAnnSepAcctGrossInt_"
             << basis_suffix(get_basis())
             << ir_suffix(interest_rate::zero)
-            << "}} Hypothetical"
-            << "\nRate of Return*"
+            << "}} Hypothetical Rate of Return*"
             ;
 
         auto pos_y_copy = pos_y;
         table_gen.output_super_header
             (interpolator_(header_zero.str()).as_html()
             ,column_zero_cash_surr_value
-            ,column_zero_irr_surr_value
+            ,column_separator
             ,pos_y_copy
             ,output_mode
             );
@@ -3007,27 +3006,26 @@ class reg_d_indiv_irr_base : public 
page_with_tabular_report
             << "{{InitAnnSepAcctGrossInt_"
             << basis_suffix(get_basis())
             << ir_suffix(interest_rate::non_zero)
-            << "}} Hypothetical"
-            << "\nRate of Return*"
+            << "}} Hypothetical Rate of Return*"
             ;
 
         table_gen.output_super_header
             (interpolator_(header_nonzero.str()).as_html()
             ,column_nonzero_cash_surr_value
-            ,column_nonzero_irr_surr_value
+            ,column_max
             ,pos_y
             ,output_mode
             );
 
         table_gen.output_horz_separator
             (column_zero_cash_surr_value
-            ,column_zero_irr_surr_value
+            ,column_separator
             ,pos_y
             ,output_mode
             );
         table_gen.output_horz_separator
             (column_nonzero_cash_surr_value
-            ,column_nonzero_irr_surr_value
+            ,column_max
             ,pos_y
             ,output_mode
             );
diff --git a/reg_d_indiv_curr.mst b/reg_d_indiv_curr.mst
index 7b3edb4..376bba6 100644
--- a/reg_d_indiv_curr.mst
+++ b/reg_d_indiv_curr.mst
@@ -28,6 +28,7 @@ End of Year Policy Values using Current Charges
 </p>
 
 {{>dollar_units}}
+<br>
 
 </font>
 
diff --git a/reg_d_indiv_curr_irr.mst b/reg_d_indiv_curr_irr.mst
index bc0f9d5..876cd95 100644
--- a/reg_d_indiv_curr_irr.mst
+++ b/reg_d_indiv_curr_irr.mst
@@ -28,6 +28,7 @@ End of Year Policy Values using Current Charges
 </p>
 
 {{>dollar_units}}
+<br>
 
 </font>
 
diff --git a/reg_d_indiv_guar_irr.mst b/reg_d_indiv_guar_irr.mst
index bbf5ca5..e9034bd 100644
--- a/reg_d_indiv_guar_irr.mst
+++ b/reg_d_indiv_guar_irr.mst
@@ -28,6 +28,7 @@ End of Year Policy Values using Guaranteed Charges
 </p>
 
 {{>dollar_units}}
+<br>
 
 </font>