summaryrefslogtreecommitdiff
path: root/src/output.cc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-10-27 22:26:13 -0400
committerJohn Wiegley <johnw@newartisans.com>2009-10-27 22:26:13 -0400
commit58fb65421829de49a3b27800ce54e093d45f0f41 (patch)
tree18fb188d4bfb45677ec0a660f0b6cd5019601621 /src/output.cc
parent3c30f74931bbe94484da82481eb9d3b788347907 (diff)
parent6c9cf1237e1e813c2d56ed51a38cc0685614e8e0 (diff)
downloadledger-58fb65421829de49a3b27800ce54e093d45f0f41.tar.gz
ledger-58fb65421829de49a3b27800ce54e093d45f0f41.tar.bz2
ledger-58fb65421829de49a3b27800ce54e093d45f0f41.zip
Merge branch 'next'
Diffstat (limited to 'src/output.cc')
-rw-r--r--src/output.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/output.cc b/src/output.cc
index b1a8cb1b..371319bd 100644
--- a/src/output.cc
+++ b/src/output.cc
@@ -54,10 +54,10 @@ format_posts::format_posts(report_t& _report,
first_line_format.parse(string(f, 0, p - f));
const char * n = p + 2;
if (const char * p = std::strstr(n, "%/")) {
- next_lines_format.parse(string(n, 0, p - n));
- between_format.parse(string(p + 2));
+ next_lines_format.parse(string(n, 0, p - n), first_line_format);
+ between_format.parse(string(p + 2), first_line_format);
} else {
- next_lines_format.parse(n);
+ next_lines_format.parse(n, first_line_format);
}
} else {
first_line_format.parse(format);
@@ -125,14 +125,14 @@ format_accounts::format_accounts(report_t& _report,
account_line_format.parse(string(f, 0, p - f));
const char * n = p + 2;
if (const char * p = std::strstr(n, "%/")) {
- total_line_format.parse(string(n, 0, p - n));
- separator_format.parse(string(p + 2));
+ total_line_format.parse(string(n, 0, p - n), account_line_format);
+ separator_format.parse(string(p + 2), account_line_format);
} else {
- total_line_format.parse(n);
+ total_line_format.parse(n, account_line_format);
}
} else {
account_line_format.parse(format);
- total_line_format.parse(format);
+ total_line_format.parse(format, account_line_format);
}
}