diff --git a/src/phreeqcpp/class_main.cpp b/src/phreeqcpp/class_main.cpp index 2730fc9d..74721e86 100644 --- a/src/phreeqcpp/class_main.cpp +++ b/src/phreeqcpp/class_main.cpp @@ -286,6 +286,7 @@ write_banner(void) #ifdef TESTING return OK; #endif +#ifndef NO_UTF8_ENCODING char buffer[80]; int len, indent; screen_msg( @@ -329,7 +330,7 @@ write_banner(void) screen_msg( " █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█\n\n"); - +#endif return 0; } diff --git a/src/phreeqcpp/print.cpp b/src/phreeqcpp/print.cpp index d4ad7b79..f3fb197d 100644 --- a/src/phreeqcpp/print.cpp +++ b/src/phreeqcpp/print.cpp @@ -1,3 +1,4 @@ +// -*- coding: windows-1252 -*- #include "Utils.h" #include "Phreeqc.h" #include "phqalloc.h" @@ -1457,7 +1458,7 @@ print_species(void) "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")); + "Molality", "Activity", "Molality", "Activity", "Gamma", "cm³/mol")); #endif /* * Print list of species @@ -1625,7 +1626,7 @@ print_surface(void) #ifdef NO_UTF8_ENCODING output_msg(sformatf("\t%11.3e sigma, C/m2\n", #else - output_msg(sformatf("\t%11.3e sigma, C/m²\n", + output_msg(sformatf("\t%11.3e sigma, C/m²\n", #endif (double) (charge * F_C_MOL / (charge_ptr->Get_specific_area() * @@ -1636,7 +1637,7 @@ print_surface(void) #ifdef NO_UTF8_ENCODING output_msg(sformatf("\tundefined sigma, C/m2\n")); #else - output_msg(sformatf("\tundefined sigma, C/m²\n")); + output_msg(sformatf("\tundefined sigma, C/m²\n")); #endif } if (use.Get_surface_ptr()->Get_type() == cxxSurface::CCM) @@ -1658,7 +1659,7 @@ print_surface(void) #ifdef NO_UTF8_ENCODING "\t%11.3e specific area, m2/mol %s\n", #else - "\t%11.3e specific area, m²/mol %s\n", + "\t%11.3e specific area, m²/mol %s\n", #endif (double) charge_ptr->Get_specific_area(), comp_ptr->Get_phase_name().c_str())); @@ -1666,7 +1667,7 @@ print_surface(void) #ifdef NO_UTF8_ENCODING "\t%11.3e m2 for %11.3e moles of %s\n\n", #else - "\t%11.3e m² for %11.3e moles of %s\n\n", + "\t%11.3e m² for %11.3e moles of %s\n\n", #endif (double) (charge_ptr->Get_grams() * charge_ptr->Get_specific_area()), @@ -1679,7 +1680,7 @@ print_surface(void) #ifdef NO_UTF8_ENCODING "\t%11.3e specific area, m2/mol %s\n", #else - "\t%11.3e specific area, m²/mol %s\n", + "\t%11.3e specific area, m²/mol %s\n", #endif (double) charge_ptr->Get_specific_area(), comp_ptr->Get_rate_name().c_str())); @@ -1687,7 +1688,7 @@ print_surface(void) #ifdef NO_UTF8_ENCODING "\t%11.3e m2 for %11.3e moles of %s\n\n", #else - "\t%11.3e m² for %11.3e moles of %s\n\n", + "\t%11.3e m² for %11.3e moles of %s\n\n", #endif (double) (charge_ptr->Get_grams() * charge_ptr->Get_specific_area()), @@ -1700,13 +1701,13 @@ print_surface(void) #ifdef NO_UTF8_ENCODING "\t%11.3e specific area, m2/g\n", #else - "\t%11.3e specific area, m²/g\n", + "\t%11.3e specific area, m²/g\n", #endif (double) charge_ptr->Get_specific_area())); #ifdef NO_UTF8_ENCODING output_msg(sformatf("\t%11.3e m2 for %11.3e g\n\n", #else - output_msg(sformatf("\t%11.3e m² for %11.3e g\n\n", + output_msg(sformatf("\t%11.3e m² for %11.3e g\n\n", #endif (double) (charge_ptr->Get_specific_area() * charge_ptr->Get_grams()), @@ -1921,28 +1922,28 @@ print_surface_cd_music(void) #ifdef NO_UTF8_ENCODING "\t%11.3e sigma, plane 0, C/m2\n", #else - "\t%11.3e sigma, plane 0, C/m²\n", + "\t%11.3e sigma, plane 0, C/m²\n", #endif (double) charge_ptr->Get_sigma0())); output_msg(sformatf( #ifdef NO_UTF8_ENCODING "\t%11.3e sigma, plane 1, C/m2\n", #else - "\t%11.3e sigma, plane 1, C/m²\n", + "\t%11.3e sigma, plane 1, C/m²\n", #endif (double) charge_ptr->Get_sigma1())); output_msg(sformatf( #ifdef NO_UTF8_ENCODING "\t%11.3e sigma, plane 2, C/m2\n", #else - "\t%11.3e sigma, plane 2, C/m²\n", + "\t%11.3e sigma, plane 2, C/m²\n", #endif (double) charge_ptr->Get_sigma2())); output_msg(sformatf( #ifdef NO_UTF8_ENCODING "\t%11.3e sigma, diffuse layer, C/m2\n\n", #else - "\t%11.3e sigma, diffuse layer, C/m²\n\n", + "\t%11.3e sigma, diffuse layer, C/m²\n\n", #endif (double) charge_ptr->Get_sigmaddl())); } @@ -1951,7 +1952,7 @@ print_surface_cd_music(void) #ifdef NO_UTF8_ENCODING output_msg(sformatf("\tundefined sigma, C/m2\n")); #else - output_msg(sformatf("\tundefined sigma, C/m²\n")); + output_msg(sformatf("\tundefined sigma, C/m²\n")); #endif } output_msg(sformatf("\t%11.3e psi, plane 0, V\n", @@ -2210,7 +2211,7 @@ print_totals(void) "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)); + "Specific Conductance (µS/cm, ", tc_x, "°C) = ", (int) SC)); #endif } /* VP: Density Start */ @@ -2220,7 +2221,7 @@ print_totals(void) #ifdef NO_UTF8_ENCODING output_msg(sformatf("%45s%9.5f", "Density (g/cm3) = ", #else - output_msg(sformatf("%46s%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()) @@ -2245,7 +2246,7 @@ print_totals(void) " (solute contributions limited to 200 oC)")); #else output_msg(sformatf("%19s\n", - " (solute contributions limited to 200 °C)")); + " (solute contributions limited to 200 °C)")); #endif } else output_msg(sformatf("\n")); @@ -2275,7 +2276,7 @@ print_totals(void) #ifdef NO_UTF8_ENCODING output_msg(sformatf("%45s%6.2f\n", "Temperature (oC) = ", #else - output_msg(sformatf("%46s%6.2f\n", "Temperature (°C) = ", + output_msg(sformatf("%46s%6.2f\n", "Temperature (°C) = ", #endif (double) tc_x));