refactor: core-fmt and core-ostream modules merged with core

example/clcpp_response.cpp

@@ -15,7 +15,7 @@
  along with this program. If not, see http://www.gnu.org/licenses./
 */
 
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <iostream>
 #ifdef MP_UNITS_MODULES
 import mp_units;

example/conversion_factor.cpp

@@ -15,7 +15,7 @@
  along with this program. If not, see http://www.gnu.org/licenses./
 */
 
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <iostream>
 #include <type_traits>
 #ifdef MP_UNITS_MODULES

example/currency.cpp

@@ -24,7 +24,7 @@
 #include <iostream>
 #include <map>
 #ifdef MP_UNITS_MODULES
-import mp_units.core_io;
+import mp_units.core;
 #else
 #include <mp-units/ostream.h>
 #include <mp-units/quantity.h>

example/foot_pound_second.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <iostream>
 #include <string_view>
 #ifdef MP_UNITS_MODULES

example/glide_computer.cpp

@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 #include "glide_computer_lib.h"
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <array>
 #include <exception>
 #include <iostream>

example/hello_units.cpp

@@ -25,7 +25,7 @@
 // !!! renders correctly in the documentation "Examples" section.                 !!!
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <iostream>
 #ifdef MP_UNITS_MODULES
 import mp_units;

example/include/geographic.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include "ranged_representation.h"
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <compare>
 #include <limits>
 #include <numbers>

example/include/validated_type.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <gsl/gsl-lite.hpp>
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <ostream>
 #include <utility>
 #ifdef MP_UNITS_MODULES

example/kalman_filter/kalman.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <tuple>
 #ifdef MP_UNITS_MODULES
 import mp_units;

example/si_constants.cpp

@@ -25,7 +25,7 @@
 // !!! renders correctly in the documentation "Examples" section.                 !!!
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <iostream>
 #ifdef MP_UNITS_MODULES
 import mp_units;

example/spectroscopy_units.cpp

@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <iostream>
 #include <tuple>
 #ifdef MP_UNITS_MODULES

example/storage_tank.cpp

@@ -20,7 +20,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <mp-units/compat_fmt_macros.h>
 #include <mp-units/compat_macros.h>
 #include <cassert>
 #include <chrono>

example/unmanned_aerial_vehicle.cpp

@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 #include "geographic.h"
-#include <mp-units/compat_fmt_macros.h>
+#include <mp-units/compat_macros.h>
 #include <cassert>
 #include <iostream>
 #ifdef MP_UNITS_MODULES