From d8691bc993281dd35f797f317ea1e9dd916a2900 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 28 Dec 2014 13:05:32 -0500
Subject: [PATCH] Text

- More polymorphic formatting.
---
 src/text.cpp | 32 ++++++++++++++++++++++++++++++++
 src/text.h   |  2 ++
 2 files changed, 34 insertions(+)

diff --git a/src/text.cpp b/src/text.cpp
index db81e55a8..7f8013787 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -851,6 +851,22 @@ const std::string format (
   return output;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+const std::string format (
+  const std::string& fmt,
+  int arg1,
+  const std::string& arg2,
+  const std::string& arg3,
+  const std::string& arg4)
+{
+  std::string output = fmt;
+  replace_positional (output, "{1}", format (arg1));
+  replace_positional (output, "{2}", arg2);
+  replace_positional (output, "{3}", arg3);
+  replace_positional (output, "{4}", arg4);
+  return output;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 const std::string format (
   const std::string& fmt,
@@ -919,6 +935,22 @@ const std::string format (
   return output;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+const std::string format (
+  const std::string& fmt,
+  const std::string& arg1,
+  const std::string& arg2,
+  const std::string& arg3,
+  const std::string& arg4)
+{
+  std::string output = fmt;
+  replace_positional (output, "{1}", arg1);
+  replace_positional (output, "{2}", arg2);
+  replace_positional (output, "{3}", arg3);
+  replace_positional (output, "{4}", arg4);
+  return output;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 std::string leftJustify (const int input, const int width)
 {
diff --git a/src/text.h b/src/text.h
index b0d9ae41f..f866f6fba 100644
--- a/src/text.h
+++ b/src/text.h
@@ -73,11 +73,13 @@ const std::string format (const std::string&, const std::string&, double);
 const std::string format (const std::string&, int, int, const std::string&);
 const std::string format (const std::string&, int, const std::string&);
 const std::string format (const std::string&, int, const std::string&, const std::string&);
+const std::string format (const std::string&, int, const std::string&, const std::string&, const std::string&);
 const std::string format (const std::string&, int, int);
 const std::string format (const std::string&, int, int, int);
 const std::string format (const std::string&, int, int, int, int);
 const std::string format (const std::string&, int, double);
 const std::string format (const std::string&, const std::string&, const std::string&, const std::string&);
+const std::string format (const std::string&, const std::string&, const std::string&, const std::string&, const std::string&);
 
 std::string leftJustify (const int, const int);
 std::string leftJustify (const std::string&, const int);