From 728e2a53f225a0d71d48d6ee4dfa9317810eb5cc Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Sun, 17 May 2020 14:26:45 +0200
Subject: [PATCH] fixed font formatting codes not having priority

---
 Demos/UiDemo.cs          | 8 ++++----
 MLEM/Formatting/Token.cs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Demos/UiDemo.cs b/Demos/UiDemo.cs
index 1c112da..b1f7f7a 100644
--- a/Demos/UiDemo.cs
+++ b/Demos/UiDemo.cs
@@ -184,18 +184,18 @@ namespace Demos {
 
             var children = this.root.GetChildren();
             var totalChildren = this.root.GetChildren(regardGrandchildren: true);
-            this.root.AddChild(new Paragraph(Anchor.AutoLeft, 1, $"The root has [Bold]{children.Count()}[Regular] children, but there are [Bold]{totalChildren.Count()}[Regular] when regarding children's children"));
+            this.root.AddChild(new Paragraph(Anchor.AutoLeft, 1, $"The root has <b>{children.Count()}</b> children, but there are <b>{totalChildren.Count()}</b> when regarding children's children"));
 
             var textFields = this.root.GetChildren<TextField>();
-            this.root.AddChild(new Paragraph(Anchor.AutoLeft, 1, $"The root has [Bold]{textFields.Count()}[Regular] text fields"));
+            this.root.AddChild(new Paragraph(Anchor.AutoLeft, 1, $"The root has <b>{textFields.Count()}</b> text fields"));
 
             var paragraphs = this.root.GetChildren<Paragraph>();
             var totalParagraphs = this.root.GetChildren<Paragraph>(regardGrandchildren: true);
-            this.root.AddChild(new Paragraph(Anchor.AutoLeft, 1, $"The root has [Bold]{paragraphs.Count()}[Regular] paragraphs, but there are [Bold]{totalParagraphs.Count()}[Regular] when regarding children's children"));
+            this.root.AddChild(new Paragraph(Anchor.AutoLeft, 1, $"The root has <b>{paragraphs.Count()}</b> paragraphs, but there are <b>{totalParagraphs.Count()}</b> when regarding children's children"));
 
             var autoWidthChildren = this.root.GetChildren(e => e.Size.X == 1);
             var autoWidthButtons = this.root.GetChildren<Button>(e => e.Size.X == 1);
-            this.root.AddChild(new Paragraph(Anchor.AutoLeft, 1, $"The root has [Bold]{autoWidthChildren.Count()}[Regular] auto-width children, [Bold]{autoWidthButtons.Count()}[Regular] of which are buttons"));
+            this.root.AddChild(new Paragraph(Anchor.AutoLeft, 1, $"The root has <b>{autoWidthChildren.Count()}</b> auto-width children, <b>{autoWidthButtons.Count()}</b> of which are buttons"));
 
             // select the first element for auto-navigation
             this.root.Root.SelectElement(this.root.GetChildren().First(c => c.CanBeSelected));
diff --git a/MLEM/Formatting/Token.cs b/MLEM/Formatting/Token.cs
index 55ed053..da09e93 100644
--- a/MLEM/Formatting/Token.cs
+++ b/MLEM/Formatting/Token.cs
@@ -35,7 +35,7 @@ namespace MLEM.Formatting {
         }
 
         public GenericFont GetFont(GenericFont defaultPick) {
-            return this.AppliedCodes.Select(c => c.GetFont(defaultPick)).FirstOrDefault();
+            return this.AppliedCodes.Select(c => c.GetFont(defaultPick)).FirstOrDefault(f => f != null);
         }
 
         public void DrawSelf(GameTime time, SpriteBatch batch, Vector2 pos, GenericFont font, Color color, float scale, float depth) {