From febdaec85e4148362c2c8a06ba204818893ce2a6 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Tue, 26 Nov 2024 10:59:02 +0100
Subject: [PATCH] feat: text ouptput should fallback to the portable mode when
 UTF-8 is not used for `text_encoding`

---
 src/core/include/mp-units/bits/text_tools.h       | 12 ++++++++++--
 src/core/include/mp-units/framework/symbol_text.h | 15 ++-------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/core/include/mp-units/bits/text_tools.h b/src/core/include/mp-units/bits/text_tools.h
index f14e0f7d7..4af3762f2 100644
--- a/src/core/include/mp-units/bits/text_tools.h
+++ b/src/core/include/mp-units/bits/text_tools.h
@@ -33,8 +33,11 @@
 import std;
 #else
 #include <cstdint>
-#endif
-#endif
+#if __cpp_lib_text_encoding
+#include <text_encoding>
+#endif  // __cpp_lib_text_encoding
+#endif  // MP_UNITS_IMPORT_STD
+#endif  // MP_UNITS_IN_MODULE_INTERFACE
 
 namespace mp_units::detail {
 
@@ -102,6 +105,11 @@ constexpr Out copy(const symbol_text<N, M>& txt, character_set char_set, Out out
     if constexpr (is_same_v<CharT, char8_t>)
       return ::mp_units::detail::copy(txt.utf8().begin(), txt.utf8().end(), out);
     else if constexpr (is_same_v<CharT, char>) {
+#if __cpp_lib_text_encoding
+      if (std::text_encoding::literal().mib() != std::text_encoding::id::UTF8)
+        // fallback to portable mode
+        return ::mp_units::detail::copy(txt.portable().begin(), txt.portable().end(), out);
+#endif
       for (const char8_t ch : txt.utf8()) *out++ = static_cast<char>(ch);
       return out;
     } else
diff --git a/src/core/include/mp-units/framework/symbol_text.h b/src/core/include/mp-units/framework/symbol_text.h
index 71fc98b02..260f7e029 100644
--- a/src/core/include/mp-units/framework/symbol_text.h
+++ b/src/core/include/mp-units/framework/symbol_text.h
@@ -38,19 +38,8 @@ import std;
 #include <compare>  // IWYU pragma: export
 #include <cstddef>
 #include <cstdint>
-#endif
-#endif
-
-#if __cpp_lib_text_encoding
-#ifndef MP_UNITS_IN_MODULE_INTERFACE
-#ifdef MP_UNITS_IMPORT_STD
-import std;
-#else
-#include <text_encoding>
-#endif
-#endif
-static_assert(std::text_encoding::literal().mib() == std::text_encoding::id::UTF8);
-#endif
+#endif  // MP_UNITS_IMPORT_STD
+#endif  // MP_UNITS_IN_MODULE_INTERFACE
 
 namespace mp_units {