[lmi-commits] [lmi] master e030aaa 7/9: Consolidate lower footer templates

[Greg Chicares]

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

    Consolidate lower footer templates
---
 finra_footer_lower.mst => footer_lower.mst |  0
 ill_reg_footer.mst                         | 40 -------------------------
 pdf_command_wx.cpp                         | 24 ++++-----------
 reg_d_group_footer_lower.mst               | 40 -------------------------
 reg_d_indiv_footer_lower.mst               | 47 ------------------------------
 5 files changed, 6 insertions(+), 145 deletions(-)

diff --git a/finra_footer_lower.mst b/footer_lower.mst
similarity index 100%
rename from finra_footer_lower.mst
rename to footer_lower.mst
diff --git a/ill_reg_footer.mst b/ill_reg_footer.mst
deleted file mode 100644
index 8b87b53..0000000
--- a/ill_reg_footer.mst
+++ /dev/null
@@ -1,40 +0,0 @@
-{{!
-    Copyright (C) 2017, 2018, 2019 Gregory W. Chicares.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2 as
-    published by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-    http://savannah.nongnu.org/projects/lmi
-    email: <address@hidden>
-    snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-}}
-
-<font size="-2">
-
-<table width="100%" cellspacing="0" cellpadding="0">
-    <tr>
-        <td colspan="3">&nbsp;</td>
-    </tr>
-    <tr>
-        <td>System Version: {{LmiVersion}}</td>
-        <td align="center">{{page_number}}</td>
-        <td align="right">{{InsCoName}}</td>
-    </tr>
-    <tr>
-        <td>{{StateMarketingImprimatur}}</td>
-        <td>&nbsp;</td>
-        <td align="right">Date Prepared: {{DatePrepared}}</td>
-    </tr>
-</table>
-
-</font>
diff --git a/pdf_command_wx.cpp b/pdf_command_wx.cpp
index d4161c3..c429ba3 100644
--- a/pdf_command_wx.cpp
+++ b/pdf_command_wx.cpp
@@ -853,8 +853,13 @@ class pdf_illustration : protected html_interpolator, 
protected pdf_writer_wx
     // level, the functions here define the default for all illustration pages.
     //
     // These functions are used by the pages deriving from page_with_marginals.
+    // The "lower" one formerly varied, but no longer does as of 2019-06; it's
+    // kept virtual just in case it ever needs to be overridden again.
     virtual std::string get_upper_footer_template_name() const = 0;
-    virtual std::string get_lower_footer_template_name() const = 0;
+    virtual std::string get_lower_footer_template_name() const
+    {
+        return "footer_lower";
+    }
 
   protected:
     // Explicitly retrieve references to base classes.
@@ -2336,8 +2341,6 @@ class pdf_illustration_naic : public pdf_illustration
 
     std::string get_upper_footer_template_name() const override
         { return {}; }
-    std::string get_lower_footer_template_name() const override
-        { return "ill_reg_footer"; }
 };
 
 // Common base class for basic illustration pages using the same columns in
@@ -2875,11 +2878,6 @@ class pdf_illustration_finra : public pdf_illustration
     {
         return "finra_footer_upper";
     }
-
-    std::string get_lower_footer_template_name() const override
-    {
-        return "finra_footer_lower";
-    }
 };
 
 // Basic illustration page of the private group placement illustration.
@@ -2952,11 +2950,6 @@ class pdf_illustration_reg_d_group : public 
pdf_illustration
     {
         return "reg_d_group_footer_upper";
     }
-
-    std::string get_lower_footer_template_name() const override
-    {
-        return "reg_d_group_footer_lower";
-    }
 };
 
 // This page exists in two almost identical versions, one using guaranteed and
@@ -3237,11 +3230,6 @@ class pdf_illustration_reg_d_indiv : public 
pdf_illustration
     {
         return "reg_d_indiv_footer_upper";
     }
-
-    std::string get_lower_footer_template_name() const override
-    {
-        return "reg_d_indiv_footer_lower";
-    }
 };
 } // Unnamed namespace.
 
diff --git a/reg_d_group_footer_lower.mst b/reg_d_group_footer_lower.mst
deleted file mode 100644
index e8f3eb5..0000000
--- a/reg_d_group_footer_lower.mst
+++ /dev/null
@@ -1,40 +0,0 @@
-{{!
-    Copyright (C) 2017, 2018, 2019 Gregory W. Chicares.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2 as
-    published by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-    http://savannah.nongnu.org/projects/lmi
-    email: <address@hidden>
-    snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-}}
-
-<font size="-2">
-
-<table width="100%" cellspacing="0" cellpadding="0">
-    <tr>
-        <td colspan="3">&nbsp;</td>
-    </tr>
-    <tr>
-        <td>{{InsCoName}}</td>
-        <td align="center">Date Prepared: {{DatePrepared}}</td>
-        <td align="right">Policy Form: {{PolicyForm}}</td>
-    </tr>
-    <tr>
-        <td>{{InsCoAddr}}</td>
-        <td align="center">System Version: {{LmiVersion}}</td>
-        <td align="right">{{page_number}}</td>
-    </tr>
-</table>
-
-</font>
diff --git a/reg_d_indiv_footer_lower.mst b/reg_d_indiv_footer_lower.mst
deleted file mode 100644
index 3c38ccf..0000000
--- a/reg_d_indiv_footer_lower.mst
+++ /dev/null
@@ -1,47 +0,0 @@
-{{!
-    Copyright (C) 2017, 2018, 2019 Gregory W. Chicares.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2 as
-    published by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-    http://savannah.nongnu.org/projects/lmi
-    email: <address@hidden>
-    snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-}}
-
-{{!
-    PDF !! This is almost the same as 'reg_d_group_footer_lower.mst',
-    which is better because it includes 'DatePrepared'. It appears
-    that one universal MST file could serve this purpose for all
-    illustration formats.
-}}
-
-<font size="-2">
-
-<table width="100%" cellspacing="0" cellpadding="0">
-    <tr>
-        <td colspan="3">&nbsp;</td>
-    </tr>
-    <tr>
-        <td>{{InsCoName}}</td>
-        <td align="center">System Version: {{LmiVersion}}</td>
-        <td align="right">Policy Form: {{PolicyForm}}</td>
-    </tr>
-    <tr>
-        <td>{{InsCoAddr}}</td>
-        <td>&nbsp;</td>
-        <td align="right">{{page_number}}</td>
-    </tr>
-</table>
-
-</font>