Bugfix: Unicode characters are not printing correctly.

At some point it seems that I accidentally mass converted all of the macro_f_utf_byte_width() and similar to macro_f_utf_char_t_width().
This broke the printing logic.

The f_print is handling normal characters and not f_utf_char_t.

diff --git a/level_0/f_print/c/print.c b/level_0/f_print/c/print.c
index 49bd6c3b224a0a202f30b8d40a42f81a2e14f22f..825b7e10c33d9983facda7f16e5aa754913054c4 100644 (file)
--- a/level_0/f_print/c/print.c
+++ b/level_0/f_print/c/print.c
@@ -44,12 +44,12 @@ extern "C" {
         return F_none;
       }
     }
-    else if (macro_f_utf_char_t_width_is(character) == 1) {
+    else if (macro_f_utf_byte_width_is(character) == 1) {
       if (fwrite_unlocked(f_print_sequence_unknown_s.string, 1, f_print_sequence_unknown_s.used, output) == f_print_sequence_unknown_s.used) {
         return F_none;
       }
     }
-    else if (macro_f_utf_char_t_width_is(character) > 1 || character > 0x1f) {
+    else if (macro_f_utf_byte_width_is(character) > 1 || character > 0x1f) {
       if (fwrite_unlocked(&character, 1, 1, output)) {
         return F_utf;
       }
@@ -659,7 +659,7 @@ extern "C" {
     for (register f_array_length_t i = 0; string[i]; ) {
 
       safe.used = 0;
-      width = macro_f_utf_char_t_width(string[i]);
+      width = macro_f_utf_byte_width(string[i]);
 
       if (width > 1) {
         if (string[i + 1]) {

diff --git a/level_0/f_print/c/print/private-to.c b/level_0/f_print/c/print/private-to.c
index ca5da007398cb5342b3e545001af3d7cfd69d348..990ac6508b163134b2af67b358ac8b93c98756c9 100644 (file)
--- a/level_0/f_print/c/print/private-to.c
+++ b/level_0/f_print/c/print/private-to.c
@@ -72,12 +72,12 @@ static inline f_status_t private_inline_f_print_to_error(void) {
         return F_none;
       }
     }
-    else if (macro_f_utf_char_t_width_is(character) == 1) {
+    else if (macro_f_utf_byte_width_is(character) == 1) {
       if (write(id, f_print_sequence_unknown_s.string, f_print_sequence_unknown_s.used) != -1) {
         return F_none;
       }
     }
-    else if (macro_f_utf_char_t_width_is(character) > 1 || character > 0x1f) {
+    else if (macro_f_utf_byte_width_is(character) > 1 || character > 0x1f) {
       if (write(id, &character, 1) != -1) {
         return F_none;
       }
@@ -216,7 +216,7 @@ static inline f_status_t private_inline_f_print_to_error(void) {
       }
 
       if (string[i]) {
-        width = macro_f_utf_char_t_width(string[i]);
+        width = macro_f_utf_byte_width(string[i]);
 
         safe = private_f_print_safely_get(string + i, width);
       }
@@ -292,7 +292,7 @@ static inline f_status_t private_inline_f_print_to_error(void) {
       }
 
       if (string[i]) {
-        width = macro_f_utf_char_t_width(string[i]);
+        width = macro_f_utf_byte_width(string[i]);
 
         safe = private_f_print_safely_get(string + i, width);
       }
@@ -553,7 +553,7 @@ static inline f_status_t private_inline_f_print_to_error(void) {
       }
 
       if (string[i]) {
-        width = macro_f_utf_char_t_width(string[i]);
+        width = macro_f_utf_byte_width(string[i]);
 
         safe = private_f_print_safely_get(string + i, width);
       }
@@ -659,7 +659,7 @@ static inline f_status_t private_inline_f_print_to_error(void) {
       }
 
       if (string[i]) {
-        width = macro_f_utf_char_t_width(string[i]);
+        width = macro_f_utf_byte_width(string[i]);
 
         safe = private_f_print_safely_get(string + i, width);
       }
@@ -777,7 +777,7 @@ static inline f_status_t private_inline_f_print_to_error(void) {
     while (i < length) {
 
       if (string[i]) {
-        width = macro_f_utf_char_t_width(string[i]);
+        width = macro_f_utf_byte_width(string[i]);
 
         safe = private_f_print_safely_get(string + i, width);
       }
@@ -844,7 +844,7 @@ static inline f_status_t private_inline_f_print_to_error(void) {
     while (i < length) {
 
       if (string[i]) {
-        width = macro_f_utf_char_t_width(string[i]);
+        width = macro_f_utf_byte_width(string[i]);
 
         safe = private_f_print_safely_get(string + i, width);
       }

diff --git a/level_0/f_print/c/print/to.c b/level_0/f_print/c/print/to.c
index 45f93d415ba285616f38e27b6e0295ca1c35dcb3..264ded3844fb0602f9967780475f270ff9e40b94 100644 (file)
--- a/level_0/f_print/c/print/to.c
+++ b/level_0/f_print/c/print/to.c
@@ -516,7 +516,7 @@ static inline f_status_t private_inline_f_print_to_error(void) {
     for (register f_array_length_t i = 0; string[i]; ) {
 
       safe = f_string_empty_s;
-      width = macro_f_utf_char_t_width(string[i]);
+      width = macro_f_utf_byte_width(string[i]);
 
       if (width > 1) {
         if (string[i + 1]) {

diff --git a/level_0/f_print/c/private-print.c b/level_0/f_print/c/private-print.c
index 8cb5c09cb091882be042c7f3fcc7a24bbc08510e..cf153c23003ec126583c1535c1a299cf7d272095 100644 (file)
--- a/level_0/f_print/c/private-print.c
+++ b/level_0/f_print/c/private-print.c
@@ -55,11 +55,11 @@ extern "C" {
       return f_print_sequence_delete_s;
     }
 
-    if (macro_f_utf_char_t_width_is(character) == 1) {
+    if (macro_f_utf_byte_width_is(character) == 1) {
       return f_print_sequence_unknown_s;
     }
 
-    if (macro_f_utf_char_t_width_is(character) > 1 || character > 0x1f) {
+    if (macro_f_utf_byte_width_is(character) > 1 || character > 0x1f) {
       return f_string_empty_s;
     }
 
@@ -403,7 +403,7 @@ extern "C" {
       }
 
       if (string[i]) {
-        width = macro_f_utf_char_t_width(string[i]);
+        width = macro_f_utf_byte_width(string[i]);
 
         safe = private_f_print_safely_get(string + i, width);
       }
@@ -555,7 +555,7 @@ extern "C" {
       }
 
       if (string[i]) {
-        width = macro_f_utf_char_t_width(string[i]);
+        width = macro_f_utf_byte_width(string[i]);
 
         safe = private_f_print_safely_get(string + i, width);
       }
@@ -761,7 +761,7 @@ extern "C" {
       }
 
       if (string[i]) {
-        width = macro_f_utf_char_t_width(string[i]);
+        width = macro_f_utf_byte_width(string[i]);
 
         safe = private_f_print_safely_get(string + i, width);
       }
@@ -871,7 +871,7 @@ extern "C" {
       }
 
       if (string[i]) {
-        width = macro_f_utf_char_t_width(string[i]);
+        width = macro_f_utf_byte_width(string[i]);
 
         safe = private_f_print_safely_get(string + i, width);
       }
@@ -1027,7 +1027,7 @@ extern "C" {
     while (i < length) {
 
       if (string[i]) {
-        width = macro_f_utf_char_t_width(string[i]);
+        width = macro_f_utf_byte_width(string[i]);
 
         safe = private_f_print_safely_get(string + i, width);
       }
@@ -1125,7 +1125,7 @@ extern "C" {
     while (i < length) {
 
       if (string[i]) {
-        width = macro_f_utf_char_t_width(string[i]);
+        width = macro_f_utf_byte_width(string[i]);
 
         safe = private_f_print_safely_get(string + i, width);
       }
@@ -1227,7 +1227,7 @@ extern "C" {
       return f_print_sequence_delete_s;
     }
 
-    if (macro_f_utf_char_t_width_is(character[0])) {
+    if (macro_f_utf_byte_width_is(character[0])) {
       if (f_utf_is_valid(character, width_max) != F_true || f_utf_is_control(character, width_max)) {
         return f_print_sequence_unknown_s;
       }