Merge pull request #57 from CommitteeOfZero/italics-support

Implement everything necessary for italics to work
CommitteeOfZero · Sep 12, 2024 · a78cb18 · a78cb18
2 parents dd6bf26 + 48429c8
commit a78cb18
Show file tree

Hide file tree

Showing 22 changed files with 129 additions and 106 deletions.
diff --git a/profiles/cc/font-lb.lua b/profiles/cc/font-lb.lua
@@ -5,8 +5,8 @@ root.Fonts = {
         OutlineSheet = "FontLBOutline",
         Columns = 64,
         Rows = 125,
-        Widths = "games/cc/font-lb/widths.bin",
-        DesignColWidth = 48,
+        AdvanceWidths = "games/cc/font-lb/widths.bin",
+        AdvanceWidthsEmWidth = 48,
         OutlineOffset = { X = -4, Y = -4 },
         LineSpacing = 14,
     }

diff --git a/profiles/cc/font.lua b/profiles/cc/font.lua
@@ -4,13 +4,13 @@ root.Fonts = {
         Sheet = "Font",
         Columns = 64,
         Rows = 117,
-        Widths = {},
-        DesignColWidth = 32,
+        AdvanceWidths = {},
+        AdvanceWidthsEmWidth = 32,
         LineSpacing = 22,
     }
 };
 
-local westernWidths = {
+local westernAdvanceWidths = {
     [0]=0x20, 0x18, 0x0D, 0x18, 0x17, 0x1A, 0x16, 0x17, 0x17, 0x18, 0x17, 0x1C,
         0x19, 0x1A, 0x1A, 0x16, 0x15, 0x1A, 0x1A, 0x08, 0x13, 0x1A, 0x17, 0x1E,
         0x1A, 0x1C, 0x18, 0x1C, 0x1A, 0x18, 0x1C, 0x1A, 0x1C, 0x20, 0x1C, 0x1A,
@@ -46,9 +46,9 @@ local westernWidths = {
 };
 
 for i = 0, (64 * 117) - 1 do
-    if i <= #westernWidths then
-        root.Fonts["Default"].Widths[i] = westernWidths[i];
+    if i <= #westernAdvanceWidths then
+        root.Fonts["Default"].AdvanceWidths[i] = westernAdvanceWidths[i];
     else
-        root.Fonts["Default"].Widths[i] = root.Fonts["Default"].DesignColWidth;
+        root.Fonts["Default"].AdvanceWidths[i] = root.Fonts["Default"].AdvanceWidthsEmWidth;
     end
 end
diff --git a/profiles/cclcc/font-lb.lua b/profiles/cclcc/font-lb.lua
@@ -5,8 +5,8 @@ root.Fonts = {
         OutlineSheet = "FontLBOutline",
         Columns = 64,
         Rows = 125,
-        Widths = "games/cc/font-lb/widths.bin",
-        DesignColWidth = 48,
+        AdvanceWidths = "games/cc/font-lb/widths.bin",
+        AdvanceWidthsEmWidth = 48,
         OutlineOffset = { X = -4, Y = -4 },
         LineSpacing = 14,
     }

diff --git a/profiles/cclcc/font.lua b/profiles/cclcc/font.lua
@@ -4,13 +4,13 @@ root.Fonts = {
         Sheet = "Font",
         Columns = 64,
         Rows = 117,
-        Widths = {},
-        DesignColWidth = 48,
+        AdvanceWidths = {},
+        AdvanceWidthsEmWidth = 48,
         LineSpacing = 22,
     }
 };
 
-local westernWidths = {
+local westernAdvanceWidths = {
     [0]=0x20, 0x18, 0x0D, 0x18, 0x17, 0x1A, 0x16, 0x17, 0x17, 0x18, 0x17, 0x1C,
         0x19, 0x1A, 0x1A, 0x16, 0x15, 0x1A, 0x1A, 0x08, 0x13, 0x1A, 0x17, 0x1E,
         0x1A, 0x1C, 0x18, 0x1C, 0x1A, 0x18, 0x1C, 0x1A, 0x1C, 0x20, 0x1C, 0x1A,
@@ -46,9 +46,9 @@ local westernWidths = {
 };
 
 for i = 0, (64 * 117) - 1 do
-    if i <= #westernWidths then
-        root.Fonts["Default"].Widths[i] = westernWidths[i] * 1.5;
+    if i <= #westernAdvanceWidths then
+        root.Fonts["Default"].AdvanceWidths[i] = westernAdvanceWidths[i] * 1.5;
     else
-        root.Fonts["Default"].Widths[i] = root.Fonts["Default"].DesignColWidth;
+        root.Fonts["Default"].AdvanceWidths[i] = root.Fonts["Default"].AdvanceWidthsEmWidth;
     end
 end
diff --git a/profiles/chlcc/font-lb.lua b/profiles/chlcc/font-lb.lua
@@ -5,8 +5,8 @@ root.Fonts = {
         OutlineSheet = "FontLBOutline",
         Columns = 64,
         Rows = 37,
-        Widths = "games/chlcc/font-lb/widths.bin",
-        DesignColWidth = 48,
+        AdvanceWidths = "games/chlcc/font-lb/widths.bin",
+        AdvanceWidthsEmWidth = 48,
         OutlineOffset = { X = -4, Y = -4 },
         LineSpacing = 14,
     }

diff --git a/profiles/chlcc/font.lua b/profiles/chlcc/font.lua
@@ -6,13 +6,13 @@ root.Fonts = {
         Sheet = "Font",
         Columns = 64,
         Rows = 37,
-        Widths = {},
-        DesignColWidth = 32,
+        AdvanceWidths = {},
+        AdvanceWidthsEmWidth = 32,
         LineSpacing = 22,
     }
 };
 
-local westernWidths = {
+local westernAdvanceWidths = {
     [0]=0x20, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
         0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
         0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
@@ -38,9 +38,9 @@ local westernWidths = {
 };
 
 for i = 0, (64 * 37) - 1 do
-    if i <= #westernWidths then
-        root.Fonts["Default"].Widths[i] = westernWidths[i];
+    if i <= #westernAdvanceWidths then
+        root.Fonts["Default"].AdvanceWidths[i] = westernAdvanceWidths[i];
     else
-        root.Fonts["Default"].Widths[i] = root.Fonts["Default"].DesignColWidth;
+        root.Fonts["Default"].AdvanceWidths[i] = root.Fonts["Default"].AdvanceWidthsEmWidth;
     end
 end
diff --git a/profiles/chn/font-lb.lua b/profiles/chn/font-lb.lua
@@ -5,8 +5,8 @@ root.Fonts = {
         OutlineSheet = "FontLBOutline",
         Columns = 64,
         Rows = 50,
-        Widths = "games/rne/font-lb/widths.bin",
-        DesignColWidth = 48,
+        AdvanceWidths = "games/rne/font-lb/widths.bin",
+        AdvanceWidthsEmWidth = 48,
         OutlineOffset = { X = -4, Y = -4 },
         LineSpacing = 14,
     }

diff --git a/profiles/chn/font.lua b/profiles/chn/font.lua
@@ -4,13 +4,13 @@ root.Fonts = {
         Sheet = "Font",
         Columns = 64,
         Rows = 117,
-        Widths = {},
-        DesignColWidth = 32,
+        AdvanceWidths = {},
+        AdvanceWidthsEmWidth = 32,
         LineSpacing = 22,
     }
 };
 
-local westernWidths = {
+local westernAdvanceWidths = {
     [0]=0x20, 0x18, 0x0D, 0x18, 0x17, 0x1A, 0x16, 0x17, 0x17, 0x18, 0x17, 0x1C,
         0x19, 0x1A, 0x1A, 0x16, 0x15, 0x1A, 0x1A, 0x08, 0x13, 0x1A, 0x17, 0x1E,
         0x1A, 0x1C, 0x18, 0x1C, 0x1A, 0x18, 0x1C, 0x1A, 0x1C, 0x20, 0x1C, 0x1A,
@@ -46,9 +46,9 @@ local westernWidths = {
 };
 
 for i = 0, (64 * 117) - 1 do
-    if i <= #westernWidths then
-        root.Fonts["Default"].Widths[i] = westernWidths[i];
+    if i <= #westernAdvanceWidths then
+        root.Fonts["Default"].AdvanceWidths[i] = westernAdvanceWidths[i];
     else
-        root.Fonts["Default"].Widths[i] = root.Fonts["Default"].DesignColWidth;
+        root.Fonts["Default"].AdvanceWidths[i] = root.Fonts["Default"].AdvanceWidthsEmWidth;
     end
 end
diff --git a/profiles/darling/font.lua b/profiles/darling/font.lua
@@ -6,13 +6,13 @@ root.Fonts = {
         Sheet = "Font",
         Columns = 64,
         Rows = 43,
-        Widths = {},
-        DesignColWidth = 32,
+        AdvanceWidths = {},
+        AdvanceWidthsEmWidth = 32,
         LineSpacing = 22,
     }
 };
 
-local westernWidths = {
+local westernAdvanceWidths = {
     [0]=0x20, 0x16, 0x0E, 0x14, 0x15, 0x16, 0x16, 0x16, 0x15, 0x16, 0x16, 0x18,
         0x16, 0x17, 0x17, 0x15, 0x14, 0x18, 0x16, 0x08, 0x0E, 0x17, 0x13, 0x1A,
         0x16, 0x19, 0x15, 0x19, 0x16, 0x15, 0x15, 0x16, 0x17, 0x1E, 0x16, 0x15,
@@ -48,9 +48,9 @@ local westernWidths = {
 };
 
 for i = 0, (64 * 43) - 1 do
-    if i <= #westernWidths then
-        root.Fonts["Default"].Widths[i] = westernWidths[i];
+    if i <= #westernAdvanceWidths then
+        root.Fonts["Default"].AdvanceWidths[i] = westernAdvanceWidths[i];
     else
-        root.Fonts["Default"].Widths[i] = root.Fonts["Default"].DesignColWidth;
+        root.Fonts["Default"].AdvanceWidths[i] = root.Fonts["Default"].AdvanceWidthsEmWidth;
     end
 end
diff --git a/profiles/dash/font-lb.lua b/profiles/dash/font-lb.lua
@@ -5,8 +5,8 @@ root.Fonts = {
         OutlineSheet = "FontLBOutline",
         Columns = 64,
         Rows = 50,
-        Widths = "games/rne/font-lb/widths.bin",
-        DesignColWidth = 48,
+        AdvanceWidths = "games/rne/font-lb/widths.bin",
+        AdvanceWidthsEmWidth = 48,
         OutlineOffset = { X = -4, Y = -4 },
         LineSpacing = 14,
     }

diff --git a/profiles/dash/font.lua b/profiles/dash/font.lua
@@ -6,13 +6,13 @@ root.Fonts = {
         Sheet = "Font",
         Columns = 64,
         Rows = 50,
-        Widths = {},
-        DesignColWidth = 32,
+        AdvanceWidths = {},
+        AdvanceWidthsEmWidth = 32,
         LineSpacing = 22,
     }
 };
 
-local westernWidths = {
+local westernAdvanceWidths = {
     [0]=0x20, 0x16, 0x0E, 0x14, 0x15, 0x16, 0x16, 0x16, 0x15, 0x16, 0x16, 0x18,
         0x16, 0x17, 0x17, 0x15, 0x14, 0x18, 0x16, 0x08, 0x0E, 0x17, 0x13, 0x1A,
         0x16, 0x19, 0x15, 0x19, 0x16, 0x15, 0x15, 0x16, 0x17, 0x1E, 0x16, 0x15,
@@ -48,9 +48,9 @@ local westernWidths = {
 };
 
 for i = 0, (64 * 50) - 1 do
-    if i <= #westernWidths then
-        root.Fonts["Default"].Widths[i] = westernWidths[i];
+    if i <= #westernAdvanceWidths then
+        root.Fonts["Default"].AdvanceWidths[i] = westernAdvanceWidths[i];
     else
-        root.Fonts["Default"].Widths[i] = root.Fonts["Default"].DesignColWidth;
+        root.Fonts["Default"].AdvanceWidths[i] = root.Fonts["Default"].AdvanceWidthsEmWidth;
     end
 end
diff --git a/profiles/mo6tw/font.lua b/profiles/mo6tw/font.lua
@@ -6,13 +6,13 @@ root.Fonts = {
         Sheet = "Font",
         Columns = 64,
         Rows = 39,
-        Widths = {},
-        DesignColWidth = 32,
+        AdvanceWidths = {},
+        AdvanceWidthsEmWidth = 32,
         LineSpacing = 22,
     }
 };
 
-local westernWidths = {
+local westernAdvanceWidths = {
     [0]=0x20, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
         0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
         0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
@@ -48,9 +48,9 @@ local westernWidths = {
 };
 
 for i = 0, (64 * 39) - 1 do
-    if i <= #westernWidths then
-        root.Fonts["Default"].Widths[i] = westernWidths[i];
+    if i <= #westernAdvanceWidths then
+        root.Fonts["Default"].AdvanceWidths[i] = westernAdvanceWidths[i];
     else
-        root.Fonts["Default"].Widths[i] = root.Fonts["Default"].DesignColWidth;
+        root.Fonts["Default"].AdvanceWidths[i] = root.Fonts["Default"].AdvanceWidthsEmWidth;
     end
 end
diff --git a/profiles/mo7/font.lua b/profiles/mo7/font.lua
@@ -6,13 +6,13 @@ root.Fonts = {
         Sheet = "Font",
         Columns = 64,
         Rows = 43,
-        Widths = {},
-        DesignColWidth = 32,
+        AdvanceWidths = {},
+        AdvanceWidthsEmWidth = 32,
         LineSpacing = 22,
     }
 };
 
-local westernWidths = {
+local westernAdvanceWidths = {
     [0]=0x20, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
         0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
         0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
@@ -48,9 +48,9 @@ local westernWidths = {
 };
 
 for i = 0, (64 * 43) - 1 do
-    if i <= #westernWidths then
-        root.Fonts["Default"].Widths[i] = westernWidths[i];
+    if i <= #westernAdvanceWidths then
+        root.Fonts["Default"].AdvanceWidths[i] = westernAdvanceWidths[i];
     else
-        root.Fonts["Default"].Widths[i] = root.Fonts["Default"].DesignColWidth;
+        root.Fonts["Default"].AdvanceWidths[i] = root.Fonts["Default"].AdvanceWidthsEmWidth;
     end
 end
diff --git a/profiles/mo8/font-lb.lua b/profiles/mo8/font-lb.lua
@@ -5,8 +5,8 @@ root.Fonts = {
         OutlineSheet = "FontLBOutline",
         Columns = 64,
         Rows = 50,
-        Widths = "games/rne/font-lb/widths.bin",
-        DesignColWidth = 48,
+        AdvanceWidths = "games/rne/font-lb/widths.bin",
+        AdvanceWidthsEmWidth = 48,
         OutlineOffset = { X = -4, Y = -4 },
         LineSpacing = 14,
     }

diff --git a/profiles/mo8/font.lua b/profiles/mo8/font.lua
@@ -4,13 +4,13 @@ root.Fonts = {
         Sheet = "Font",
         Columns = 64,
         Rows = 116,
-        Widths = {},
-        DesignColWidth = 48,
+        AdvanceWidths = {},
+        AdvanceWidthsEmWidth = 48,
         LineSpacing = 22,
     }
 };
 
-local westernWidths = {
+local westernAdvanceWidths = {
     [0]=0x20, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
         0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
         0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
@@ -39,9 +39,9 @@ local westernWidths = {
 };
 
 for i = 0, (64 * 116) - 1 do
-    if i <= #westernWidths then
-        root.Fonts["Default"].Widths[i] = westernWidths[i] * 1.5;
+    if i <= #westernAdvanceWidths then
+        root.Fonts["Default"].AdvanceWidths[i] = westernAdvanceWidths[i] * 1.5;
     else
-        root.Fonts["Default"].Widths[i] = root.Fonts["Default"].DesignColWidth;
+        root.Fonts["Default"].AdvanceWidths[i] = root.Fonts["Default"].AdvanceWidthsEmWidth;
     end
 end
diff --git a/profiles/rne/font-lb.lua b/profiles/rne/font-lb.lua
@@ -5,8 +5,8 @@ root.Fonts = {
         OutlineSheet = "FontLBOutline",
         Columns = 64,
         Rows = 50,
-        Widths = "games/rne/font-lb/widths.bin",
-        DesignColWidth = 48,
+        AdvanceWidths = "games/rne/font-lb/widths.bin",
+        AdvanceWidthsEmWidth = 48,
         OutlineOffset = { X = -4, Y = -4 },
         LineSpacing = 14,
     }

diff --git a/profiles/rne/font.lua b/profiles/rne/font.lua
@@ -6,13 +6,13 @@ root.Fonts = {
         Sheet = "Font",
         Columns = 64,
         Rows = 50,
-        Widths = {},
-        DesignColWidth = 32,
+        AdvanceWidths = {},
+        AdvanceWidthsEmWidth = 32,
         LineSpacing = 22,
     }
 };
 
-local westernWidths = {
+local westernAdvanceWidths = {
     [0]=0x20, 0x16, 0x0E, 0x14, 0x15, 0x16, 0x16, 0x16, 0x15, 0x16, 0x16, 0x18,
         0x16, 0x17, 0x17, 0x15, 0x14, 0x18, 0x16, 0x08, 0x0E, 0x17, 0x13, 0x1A,
         0x16, 0x19, 0x15, 0x19, 0x16, 0x15, 0x15, 0x16, 0x17, 0x1E, 0x16, 0x15,
@@ -48,9 +48,9 @@ local westernWidths = {
 };
 
 for i = 0, (64 * 50) - 1 do
-    if i <= #westernWidths then
-        root.Fonts["Default"].Widths[i] = westernWidths[i];
+    if i <= #westernAdvanceWidths then
+        root.Fonts["Default"].AdvanceWidths[i] = westernAdvanceWidths[i];
     else
-        root.Fonts["Default"].Widths[i] = root.Fonts["Default"].DesignColWidth;
+        root.Fonts["Default"].AdvanceWidths[i] = root.Fonts["Default"].AdvanceWidthsEmWidth;
     end
 end