[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 5ef1aa2 3/6: Adjust whitespace for vertical a
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 5ef1aa2 3/6: Adjust whitespace for vertical alignment |
Date: |
Sat, 13 Oct 2018 20:35:18 -0400 (EDT) |
branch: master
commit 5ef1aa2c0d302c5c3226e8442fa51b6ca9f800ac
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Adjust whitespace for vertical alignment
---
group_quote_pdf_gen_wx.cpp | 54 +++++++++++++++++++++++-----------------------
pdf_writer_wx.cpp | 16 +++++++-------
pdf_writer_wx.hpp | 20 ++++++++---------
3 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/group_quote_pdf_gen_wx.cpp b/group_quote_pdf_gen_wx.cpp
index 51eefec..b6eec87 100644
--- a/group_quote_pdf_gen_wx.cpp
+++ b/group_quote_pdf_gen_wx.cpp
@@ -221,8 +221,8 @@ class group_quote_pdf_generator_wx
static std::shared_ptr<group_quote_pdf_generator> do_create()
{
return std::shared_ptr<group_quote_pdf_generator>
- (new group_quote_pdf_generator_wx()
- );
+ (new group_quote_pdf_generator_wx()
+ );
}
void add_ledger(Ledger const& ledger) override;
@@ -243,34 +243,34 @@ class group_quote_pdf_generator_wx
// updated with the space remaining on the last page on output.
int compute_pages_for_table_rows
(pdf_writer_wx& pdf_writer
- ,int& remaining_space
- ,int header_height
- ,int row_height
- ,int last_row_y
+ ,int & remaining_space
+ ,int header_height
+ ,int row_height
+ ,int last_row_y
);
void output_page_number_and_version
(pdf_writer_wx& pdf_writer
- ,int total_pages
- ,int current_page
+ ,int total_pages
+ ,int current_page
);
void output_image_header
(pdf_writer_wx& pdf_writer
- ,int& pos_y
+ ,int & pos_y
);
void output_document_header
- (pdf_writer_wx& pdf_writer
- ,int& pos_y
+ (pdf_writer_wx& pdf_writer
+ ,int & pos_y
);
void output_aggregate_values
- (pdf_writer_wx& pdf_writer
+ (pdf_writer_wx & pdf_writer
,wx_table_generator& table_gen
,int& pos_y
);
void output_footer
- (pdf_writer_wx& pdf_writer
- ,int& pos_y
- ,oenum_render_or_only_measure output_mode
+ (pdf_writer_wx & pdf_writer
+ ,int & pos_y
+ ,oenum_render_or_only_measure output_mode
);
class totals_data; // Fwd decl for fill_global_report_data() argument.
@@ -353,7 +353,7 @@ void assert_nonblank(std::string const& value, std::string
const& name)
/// set of data used here should be reflected there.
void group_quote_pdf_generator_wx::global_report_data::fill_global_report_data
- (Ledger const& ledger
+ (Ledger const& ledger
,totals_data const& totals
)
{
@@ -790,10 +790,10 @@ void group_quote_pdf_generator_wx::save(std::string
const& output_filename)
int group_quote_pdf_generator_wx::compute_pages_for_table_rows
(pdf_writer_wx& pdf_writer
- ,int& remaining_space
- ,int header_height
- ,int row_height
- ,int last_row_y
+ ,int & remaining_space
+ ,int header_height
+ ,int row_height
+ ,int last_row_y
)
{
int total_pages = 1;
@@ -821,8 +821,8 @@ int
group_quote_pdf_generator_wx::compute_pages_for_table_rows
void group_quote_pdf_generator_wx::output_page_number_and_version
(pdf_writer_wx& pdf_writer
- ,int total_pages
- ,int current_page
+ ,int total_pages
+ ,int current_page
)
{
wxRect const footer_area
@@ -849,7 +849,7 @@ void
group_quote_pdf_generator_wx::output_page_number_and_version
void group_quote_pdf_generator_wx::output_image_header
(pdf_writer_wx& pdf_writer
- ,int& pos_y
+ ,int & pos_y
)
{
wxImage banner_image(load_image("group_quote_banner.png"));
@@ -888,7 +888,7 @@ void group_quote_pdf_generator_wx::output_image_header
void group_quote_pdf_generator_wx::output_document_header
(pdf_writer_wx& pdf_writer
- ,int& pos_y
+ ,int & pos_y
)
{
using namespace html;
@@ -1152,9 +1152,9 @@ void group_quote_pdf_generator_wx::output_aggregate_values
}
void group_quote_pdf_generator_wx::output_footer
- (pdf_writer_wx& pdf_writer
- ,int& pos_y
- ,oenum_render_or_only_measure output_mode
+ (pdf_writer_wx & pdf_writer
+ ,int & pos_y
+ ,oenum_render_or_only_measure output_mode
)
{
wxImage logo_image(load_image("company_logo.png"));
diff --git a/pdf_writer_wx.cpp b/pdf_writer_wx.cpp
index 5043a18..9457570 100644
--- a/pdf_writer_wx.cpp
+++ b/pdf_writer_wx.cpp
@@ -90,15 +90,15 @@ class dc_font_preserver
} // Unnamed namespace.
pdf_writer_wx::pdf_writer_wx
- (wxString const& output_filename
- ,wxPrintOrientation orientation
- ,html_font_sizes const& font_sizes
+ (wxString const& output_filename
+ ,wxPrintOrientation orientation
+ ,html_font_sizes const& font_sizes
)
- :print_data_ {make_print_data(output_filename, orientation)}
- ,pdf_dc_ {print_data_}
- ,html_parser_ {nullptr}
- ,html_font_sizes_ {font_sizes}
- ,total_page_size_ {pdf_dc_.GetSize()}
+ :print_data_ {make_print_data(output_filename, orientation)}
+ ,pdf_dc_ {print_data_}
+ ,html_parser_ {nullptr}
+ ,html_font_sizes_ {font_sizes}
+ ,total_page_size_ {pdf_dc_.GetSize()}
{
// Ensure that the output is independent of the current display resolution:
// it seems that this is only the case with the PDF map mode and wxDC mode
diff --git a/pdf_writer_wx.hpp b/pdf_writer_wx.hpp
index b22a7bb..a6013ed 100644
--- a/pdf_writer_wx.hpp
+++ b/pdf_writer_wx.hpp
@@ -46,9 +46,9 @@ class pdf_writer_wx
// The font sizes array specifies the sizes, in points, of the standard
// HTML3 fonts (1..7).
pdf_writer_wx
- (wxString const& output_filename
+ (wxString const& output_filename
,wxPrintOrientation orientation
- ,html_font_sizes const& font_sizes
+ ,html_font_sizes const& font_sizes
);
pdf_writer_wx(pdf_writer_wx const&) = delete;
@@ -62,9 +62,9 @@ class pdf_writer_wx
// instead of working at a lower level with the dc() accessor.
std::vector<int> paginate_html
- (int page_width
- ,int page_height
- ,wxHtmlContainerCell& cell
+ (int page_width
+ ,int page_height
+ ,wxHtmlContainerCell& cell
);
int output_html
@@ -116,12 +116,12 @@ class pdf_writer_wx
// reserved for the normal contents, excluding horizontal and vertical
// margins. Total width and height include the margins.
- int get_horz_margin() const;
- int get_vert_margin() const;
- int get_page_width() const;
- int get_total_width() const;
+ int get_horz_margin () const;
+ int get_vert_margin () const;
+ int get_page_width () const;
+ int get_total_width () const;
int get_total_height() const;
- int get_page_bottom() const;
+ int get_page_bottom () const;
private:
void initialize_html_parser(wxHtmlWinParser& html_parser);
- [lmi-commits] [lmi] master updated (0c75401 -> 3e5ce14), Greg Chicares, 2018/10/13
- [lmi-commits] [lmi] master 5acf3fb 5/6: Rename a member function for concinnity, Greg Chicares, 2018/10/13
- [lmi-commits] [lmi] master 3e5ce14 6/6: Use more powerful testing commands, Greg Chicares, 2018/10/13
- [lmi-commits] [lmi] master 5ef1aa2 3/6: Adjust whitespace for vertical alignment,
Greg Chicares <=
- [lmi-commits] [lmi] master 63c28da 4/6: Remove a needless "PDF !!" marker, Greg Chicares, 2018/10/13
- [lmi-commits] [lmi] master 3639ac5 1/6: Remove references to obsolete '--pyx=only_new_pdf', Greg Chicares, 2018/10/13
- [lmi-commits] [lmi] master 22c911a 2/6: Pass modifiable arguments by reference, Greg Chicares, 2018/10/13