From 87bbb6a6f08a3f6cf0e4122e9c080db4ef000344 Mon Sep 17 00:00:00 2001
From: "Charlton, Scott R" <charlton@usgs.gov>
Date: Sat, 5 Sep 2020 21:06:50 -0700
Subject: [PATCH] adjusted alignment for utf-8 strings

---
 print.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/print.cpp b/print.cpp
index 18ccd3b5..1b8ab957 100644
--- a/print.cpp
+++ b/print.cpp
@@ -1479,10 +1479,11 @@ print_species(void)
 	{
 		output_msg(sformatf("%50s%10s%10s%10s\n", "Log", "Log", "Log", "mole V"));
 	}
-	output_msg(sformatf("   %-13s%12s%12s%10s%10s%10s%10s\n\n", "Species",
 #ifdef NO_UTF8_ENCODING
+	output_msg(sformatf("   %-13s%12s%12s%10s%10s%10s%10s\n\n", "Species",
 			   "Molality", "Activity", "Molality", "Activity", "Gamma", "cm3/mol"));
 #else
+	output_msg(sformatf("   %-13s%12s%12s%10s%10s%10s%11s\n\n", "Species",
 			   "Molality", "Activity", "Molality", "Activity", "Gamma", "cm³/mol"));
 #endif
 /*
@@ -2232,10 +2233,11 @@ print_totals(void)
 	if (SC > 0)
 	{
 		//output_msg(sformatf("%36s%i%7s%i\n",
-		output_msg(sformatf("%35s%3.0f%7s%i\n",
 #ifdef NO_UTF8_ENCODING
+		output_msg(sformatf("%35s%3.0f%7s%i\n",
 				   "Specific Conductance (uS/cm, ", tc_x, "oC)  = ", (int) SC));
 #else
+		output_msg(sformatf("%36s%3.0f%7s%i\n",
 				   "Specific Conductance (µS/cm, ", tc_x, "°C)  = ", (int) SC));
 #endif
 	}
@@ -2246,7 +2248,7 @@ print_totals(void)
 #ifdef NO_UTF8_ENCODING
 		output_msg(sformatf("%45s%9.5f", "Density (g/cm3)  = ",
 #else
-		output_msg(sformatf("%45s%9.5f", "Density (g/cm³)  = ",
+		output_msg(sformatf("%46s%9.5f", "Density (g/cm³)  = ",
 #endif
 			   (double) dens));
 		if (state == INITIAL_SOLUTION && use.Get_solution_ptr()->Get_initial_data()->Get_calc_density())
@@ -2266,10 +2268,11 @@ print_totals(void)
 			   (double) viscos));
 		if (tc_x > 200 && !pure_water) 
 		{
-			output_msg(sformatf("%18s\n", 
 #ifdef NO_UTF8_ENCODING
+			output_msg(sformatf("%18s\n",
 				   " (solute contributions limited to 200 oC)"));
 #else
+			output_msg(sformatf("%19s\n",
 				   " (solute contributions limited to 200 °C)"));
 #endif
 		}
@@ -2300,7 +2303,7 @@ print_totals(void)
 #ifdef NO_UTF8_ENCODING
 	output_msg(sformatf("%45s%6.2f\n", "Temperature (oC)  = ",
 #else
-	output_msg(sformatf("%45s%6.2f\n", "Temperature (°C)  = ",
+	output_msg(sformatf("%46s%6.2f\n", "Temperature (°C)  = ",
 #endif
 			   (double) tc_x));