1 files changed, 21 insertions, 7 deletions

diff --git a/src/ui/text.h b/src/ui/text.h
index 9a22620f..7dc4aa38 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -27,17 +27,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include <SDL_render.h>
 
+/* Size names: regular (1x) -> medium (1.2x) -> big (1.33x) -> large (1.67x) -> huge (2x) */
+
 enum iFontId {
     default_FontId,
     defaultMedium_FontId,
     defaultMonospace_FontId,
+    /* content fonts */
     regular_FontId,
     monospace_FontId,
     monospaceSmall_FontId,
     medium_FontId,
+    big_FontId,
     italic_FontId,
     bold_FontId,
-    mediumBold_FontId,
+    bigBold_FontId,
     largeBold_FontId,
     hugeBold_FontId,
     largeLight_FontId,    
@@ -46,27 +50,34 @@ enum iFontId {
     defaultMediumSymbols_FontId,
     symbols_FontId,
     mediumSymbols_FontId,
+    bigSymbols_FontId,
     largeSymbols_FontId,
     hugeSymbols_FontId,
-    smallSymbols_FontId,
+    monospaceSymbols_FontId,
+    monospaceSmallSymbols_FontId,
     /* emoji fonts */
     defaultEmoji_FontId,
     defaultMediumEmoji_FontId,
     emoji_FontId,
     mediumEmoji_FontId,
+    bigEmoji_FontId,
     largeEmoji_FontId,
     hugeEmoji_FontId,
-    smallEmoji_FontId,
+    monospaceEmoji_FontId,
+    monospaceSmallEmoji_FontId,
     /* japanese script */
-    smallJapanese_FontId,
+    defaultJapanese_FontId,
+    monospaceSmallJapanese_FontId,
+    monospaceJapanese_FontId,
     regularJapanese_FontId,
     mediumJapanese_FontId,
+    bigJapanese_FontId,
     largeJapanese_FontId,
     hugeJapanese_FontId,
     max_FontId,
 
     /* Meta: */
-    fromSymbolsToEmojiOffset_FontId = 7,
+    fromSymbolsToEmojiOffset_FontId = 9,
 
     /* UI fonts: */
     uiLabel_FontId        = default_FontId,
@@ -81,12 +92,15 @@ enum iFontId {
     quote_FontId             = italic_FontId,
     heading1_FontId          = hugeBold_FontId,
     heading2_FontId          = largeBold_FontId,
-    heading3_FontId          = medium_FontId,
+    heading3_FontId          = big_FontId,
     banner_FontId            = largeLight_FontId,
 };
 
 iLocalDef iBool isJapanese_FontId(enum iFontId id) {
-    return id >= smallJapanese_FontId && id <= hugeJapanese_FontId;
+    return id >= defaultJapanese_FontId && id <= hugeJapanese_FontId;
+}
+iLocalDef iBool isVariationSelector_Char(iChar ch) {
+    return ch >= 0xfe00 && ch <= 0xfe0f;
 }
 
 #define variationSelectorEmoji_Char     ((iChar) 0xfe0f)