diff --git a/bin/segment2.c b/bin/segment2.c index de8ae9fd..e04be7d3 100644 --- a/bin/segment2.c +++ b/bin/segment2.c @@ -3657,6 +3657,63 @@ ALIGNED8 static const u8 texture_font_normal_char_squ[] = { #include "textures/segment2/custom_font_normal_char_squ.ia4.inc.c" }; +// portuguese + +ALIGNED8 static const u8 texture_font_normal_char_pa[] = { +#include "textures/segment2/custom_font_normal_char_pa.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_pa2[] = { +#include "textures/segment2/custom_font_normal_char_pa2.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_pa3[] = { +#include "textures/segment2/custom_font_normal_char_pa3.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_pc[] = { +#include "textures/segment2/custom_font_normal_char_pc.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_pca[] = { +#include "textures/segment2/custom_font_normal_char_pca.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_pca2[] = { +#include "textures/segment2/custom_font_normal_char_pca2.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_pca3[] = { +#include "textures/segment2/custom_font_normal_char_pca3.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_pcc[] = { +#include "textures/segment2/custom_font_normal_char_pcc.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_pce2[] = { +#include "textures/segment2/custom_font_normal_char_pce2.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_pco2[] = { +#include "textures/segment2/custom_font_normal_char_pco2.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_pco3[] = { +#include "textures/segment2/custom_font_normal_char_pco3.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_pe2[] = { +#include "textures/segment2/custom_font_normal_char_pe2.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_po2[] = { +#include "textures/segment2/custom_font_normal_char_po2.ia4.inc.c" +}; + +ALIGNED8 static const u8 texture_font_normal_char_po3[] = { +#include "textures/segment2/custom_font_normal_char_po3.ia4.inc.c" +}; const u8* const font_normal_chars[] = { texture_font_char_us_exclamation, // ! @@ -3772,6 +3829,20 @@ const u8* const font_normal_chars[] = { texture_font_normal_char_sex, // ¡ texture_font_normal_char_squ, // ¿ + texture_font_normal_char_pa, // à + texture_font_normal_char_pa2, // â + texture_font_normal_char_pa3, // ã + texture_font_normal_char_pe2, // ê + texture_font_normal_char_po2, // ô + texture_font_normal_char_po3, // õ + texture_font_normal_char_pc, // ç + texture_font_normal_char_pca, // À + texture_font_normal_char_pca2, // Â + texture_font_normal_char_pca3, // Ã + texture_font_normal_char_pce2, // Ê + texture_font_normal_char_pco2, // Ô + texture_font_normal_char_pco3, // Õ + texture_font_normal_char_pcc, // Ç }; const f32 font_normal_widths[] = { @@ -3796,6 +3867,12 @@ const f32 font_normal_widths[] = { 0.3750f, 0.3750f, 0.3125f, 0.3750f, 0.3750f, 0.3750f, 0.5000f, /* ¡ ¿ */ 0.3125f, 0.4375f, + +/* à â ã ê ô õ ç */ + 0.3750f, 0.3750f, 0.3750f, 0.3125f, 0.3125f, 0.3125f, 0.3125f, +/* À Â Ã Ê Ô Õ Ç */ + 0.3750f, 0.3750f, 0.3750f, 0.3750f, 0.3750f, 0.3750f, 0.3750f, + }; diff --git a/src/pc/djui/djui_font.c b/src/pc/djui/djui_font.c index 68353e88..cb8870f0 100644 --- a/src/pc/djui/djui_font.c +++ b/src/pc/djui/djui_font.c @@ -24,13 +24,31 @@ struct SmCodeGlyph sSmCodeGlyphs[] = { { -61, -111, 141 }, // Ñ { -62, -95, 142 }, // ¡ { -62, -65, 143 }, // ¿ + + { -61, -96, 144 }, // à + { -61, -94, 145 }, // â + { -61, -93, 146 }, // ã + { -61, -86, 147 }, // ê + { -61, -76, 148 }, // ô + { -61, -75, 149 }, // õ + { -61, -89, 150 }, // ç + { -61, -128, 151 }, // À + { -61, -126, 152 }, // Â + { -61, -125, 153 }, // Ã + { -61, -118, 154 }, // Ê + { -61, -108, 155 }, // Ô + { -61, -107, 156 }, // Õ + { -61, -121, 157 }, // Ç }; void djui_font_convert_to_smcode(char* text) { size_t glyphCount = sizeof(sSmCodeGlyphs) / sizeof(sSmCodeGlyphs[0]); + //printf("....................\n"); + //printf("%s\n", text); char* t = text; while (*t != '\0') { + //printf("%d ", *t); for (size_t i = 0; i < glyphCount; i++) { struct SmCodeGlyph* glyph = &sSmCodeGlyphs[i]; if (t[0] == glyph->unicode1 && t[1] == glyph->unicode2) { @@ -43,6 +61,7 @@ void djui_font_convert_to_smcode(char* text) { } t++; } + //printf("\n....................\n"); } bool djui_font_valid_smcode(char c) { diff --git a/textures/segment2/custom_font_normal_char_pa.ia4.png b/textures/segment2/custom_font_normal_char_pa.ia4.png new file mode 100644 index 00000000..9ce6b0ec Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pa.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_pa2.ia4.png b/textures/segment2/custom_font_normal_char_pa2.ia4.png new file mode 100644 index 00000000..195b1f01 Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pa2.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_pa3.ia4.png b/textures/segment2/custom_font_normal_char_pa3.ia4.png new file mode 100644 index 00000000..bd4c6ad3 Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pa3.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_pc.ia4.png b/textures/segment2/custom_font_normal_char_pc.ia4.png new file mode 100644 index 00000000..08879c9a Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pc.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_pc.ia4.png~ b/textures/segment2/custom_font_normal_char_pc.ia4.png~ new file mode 100644 index 00000000..9b5b6e4a Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pc.ia4.png~ differ diff --git a/textures/segment2/custom_font_normal_char_pca.ia4.png b/textures/segment2/custom_font_normal_char_pca.ia4.png new file mode 100644 index 00000000..518ead9a Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pca.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_pca2.ia4.png b/textures/segment2/custom_font_normal_char_pca2.ia4.png new file mode 100644 index 00000000..f4050f02 Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pca2.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_pca3.ia4.png b/textures/segment2/custom_font_normal_char_pca3.ia4.png new file mode 100644 index 00000000..aff590e1 Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pca3.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_pcc.ia4.png b/textures/segment2/custom_font_normal_char_pcc.ia4.png new file mode 100644 index 00000000..8717fb8c Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pcc.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_pcc.ia4.png~ b/textures/segment2/custom_font_normal_char_pcc.ia4.png~ new file mode 100644 index 00000000..e82ff423 Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pcc.ia4.png~ differ diff --git a/textures/segment2/custom_font_normal_char_pce2.ia4.png b/textures/segment2/custom_font_normal_char_pce2.ia4.png new file mode 100644 index 00000000..d21f3ee8 Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pce2.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_pco2.ia4.png b/textures/segment2/custom_font_normal_char_pco2.ia4.png new file mode 100644 index 00000000..cceb68ab Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pco2.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_pco3.ia4.png b/textures/segment2/custom_font_normal_char_pco3.ia4.png new file mode 100644 index 00000000..2857a25b Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pco3.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_pe2.ia4.png b/textures/segment2/custom_font_normal_char_pe2.ia4.png new file mode 100644 index 00000000..de11dd5d Binary files /dev/null and b/textures/segment2/custom_font_normal_char_pe2.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_po2.ia4.png b/textures/segment2/custom_font_normal_char_po2.ia4.png new file mode 100644 index 00000000..a47ea282 Binary files /dev/null and b/textures/segment2/custom_font_normal_char_po2.ia4.png differ diff --git a/textures/segment2/custom_font_normal_char_po3.ia4.png b/textures/segment2/custom_font_normal_char_po3.ia4.png new file mode 100644 index 00000000..3f64d4b7 Binary files /dev/null and b/textures/segment2/custom_font_normal_char_po3.ia4.png differ