Merged PR 53325: Fix #147705 (italic fonts)

anton-trackman · anton-trackman · commit 656f7266da2b · 2023-09-18T11:37:40.000Z
Fix #147705 (italic fonts)
diff --git a/Editor/FigmaParser.cs b/Editor/FigmaParser.cs
@@ -686,7 +686,7 @@ public UssStyle(string name, Func<string, string, (bool valid, string path)> get
                 }
                 else if (type == Style.StyleType.TEXT && node is TextNode text)
                 {
-                    AddTextStyle(text.style.fontSize, text.style.fontFamily, text.style.fontPostScriptName, text.style.textAlignHorizontal, text.style.textAlignVertical);
+                    AddTextStyle(text.style.fontSize, text.style.fontFamily, text.style.fontPostScriptName, text.style.textAlignHorizontal, text.style.textAlignVertical, text.style.italic is not null && text.style.italic.Value);
                 }
                 else if (type == Style.StyleType.EFFECT && node is BlendMixin blend)
                 {
@@ -880,7 +880,7 @@ void AddTextNode(TextNode node)
                 AddDefaultShapeNode(node);
 
                 FixWhiteSpace();
-                AddTextStyle(node.style.fontSize, node.style.fontFamily, node.style.fontPostScriptName, node.style.textAlignHorizontal, node.style.textAlignVertical);
+                AddTextStyle(node.style.fontSize, node.style.fontFamily, node.style.fontPostScriptName, node.style.textAlignHorizontal, node.style.textAlignVertical, node.style.italic is not null && node.style.italic.Value);
             }
             void AddComponentSetNode(ComponentSetNode node)
             {
@@ -1475,18 +1475,19 @@ void AddStrokeFillStyle(IEnumerable<Paint> strokes)
                     }
                 }
             }
-            void AddTextStyle(number? fontSize, string fontFamily, string fontPostScriptName, TextAlignHorizontal? textAlignHorizontal, TextAlignVertical? textAlignVertical)
+            void AddTextStyle(number? fontSize, string fontFamily, string fontPostScriptName, TextAlignHorizontal? textAlignHorizontal, TextAlignVertical? textAlignVertical, bool italic)
             {
                 void AddUnityFont()
                 {
-                    (bool valid, string url) = getAssetPath(fontPostScriptName, "ttf");
+                    string postfix = italic && !fontPostScriptName.Contains("Italic") ? "Italic" : string.Empty;
+                    (bool valid, string url) = getAssetPath($"{fontPostScriptName}{postfix}", "ttf");
                     if (valid)
                     {
                         unityFont = $"url('{url}')";
                     }
                     else
                     {
-                        (valid, url) = getAssetPath(fontPostScriptName, "otf");
+                        (valid, url) = getAssetPath($"{fontPostScriptName}{postfix}", "otf");
                         if (valid)
                         {
                             unityFont = $"url('{url}')";

Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,7 @@ public UssStyle(string name, Func<string, string, (bool valid, string path)> get`
`686`	`686`	`}`
`687`	`687`	`else if (type == Style.StyleType.TEXT && node is TextNode text)`
`688`	`688`	`{`
`689`		`- AddTextStyle(text.style.fontSize, text.style.fontFamily, text.style.fontPostScriptName, text.style.textAlignHorizontal, text.style.textAlignVertical);`
	`689`	`+ AddTextStyle(text.style.fontSize, text.style.fontFamily, text.style.fontPostScriptName, text.style.textAlignHorizontal, text.style.textAlignVertical, text.style.italic is not null && text.style.italic.Value);`
`690`	`690`	`}`
`691`	`691`	`else if (type == Style.StyleType.EFFECT && node is BlendMixin blend)`
`692`	`692`	`{`
`@@ -880,7 +880,7 @@ void AddTextNode(TextNode node)`
`880`	`880`	`AddDefaultShapeNode(node);`
`881`	`881`
`882`	`882`	`FixWhiteSpace();`
`883`		`- AddTextStyle(node.style.fontSize, node.style.fontFamily, node.style.fontPostScriptName, node.style.textAlignHorizontal, node.style.textAlignVertical);`
	`883`	`+ AddTextStyle(node.style.fontSize, node.style.fontFamily, node.style.fontPostScriptName, node.style.textAlignHorizontal, node.style.textAlignVertical, node.style.italic is not null && node.style.italic.Value);`
`884`	`884`	`}`
`885`	`885`	`void AddComponentSetNode(ComponentSetNode node)`
`886`	`886`	`{`
`@@ -1475,18 +1475,19 @@ void AddStrokeFillStyle(IEnumerable<Paint> strokes)`
`1475`	`1475`	`}`
`1476`	`1476`	`}`
`1477`	`1477`	`}`
`1478`		`- void AddTextStyle(number? fontSize, string fontFamily, string fontPostScriptName, TextAlignHorizontal? textAlignHorizontal, TextAlignVertical? textAlignVertical)`
	`1478`	`+ void AddTextStyle(number? fontSize, string fontFamily, string fontPostScriptName, TextAlignHorizontal? textAlignHorizontal, TextAlignVertical? textAlignVertical, bool italic)`
`1479`	`1479`	`{`
`1480`	`1480`	`void AddUnityFont()`
`1481`	`1481`	`{`
`1482`		`- (bool valid, string url) = getAssetPath(fontPostScriptName, "ttf");`
	`1482`	`+ string postfix = italic && !fontPostScriptName.Contains("Italic") ? "Italic" : string.Empty;`
	`1483`	`+ (bool valid, string url) = getAssetPath($"{fontPostScriptName}{postfix}", "ttf");`
`1483`	`1484`	`if (valid)`
`1484`	`1485`	`{`
`1485`	`1486`	`unityFont = $"url('{url}')";`
`1486`	`1487`	`}`
`1487`	`1488`	`else`
`1488`	`1489`	`{`
`1489`		`- (valid, url) = getAssetPath(fontPostScriptName, "otf");`
	`1490`	`+ (valid, url) = getAssetPath($"{fontPostScriptName}{postfix}", "otf");`
`1490`	`1491`	`if (valid)`
`1491`	`1492`	`{`
`1492`	`1493`	`unityFont = $"url('{url}')";`