Ensure fallback to font instead of fallback to typeface

MatteoH2O1999 · MatteoH2O1999 · commit 0da7ec20e22d · 2026-01-22T15:27:12.000+01:00
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/Barcode128ElementDrawer.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/Barcode128ElementDrawer.cs
@@ -77,7 +77,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo
                 {
                     // TODO: use font 0, auto scale for Mode D
                     float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;
-                    SKTypeface labelTypeFace = options.FontManager.FontLoader("A");
+                    SKTypeface labelTypeFace = options.FontManager.GetFont("A");
                     SKFont labelFont = new(labelTypeFace, labelFontSize);
                     this.DrawInterpretationLine(interpretation, labelFont, x, y, resizedImage.Width, resizedImage.Height, barcode.FieldOrigin != null, barcode.FieldOrientation, barcode.PrintInterpretationLineAboveCode, options);
                 }
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/Barcode39ElementDrawer.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/Barcode39ElementDrawer.cs
@@ -55,7 +55,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo
                 if (barcode.PrintInterpretationLine)
                 {
                     float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;
-                    SKTypeface labelTypeFace = options.FontManager.FontLoader("A");
+                    SKTypeface labelTypeFace = options.FontManager.GetFont("A");
                     SKFont labelFont = new(labelTypeFace, labelFontSize);
                     this.DrawInterpretationLine(interpretation, labelFont, x, y, resizedImage.Width, resizedImage.Height, barcode.FieldOrigin != null, barcode.FieldOrientation, barcode.PrintInterpretationLineAboveCode, options);
                 }
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/Barcode93ElementDrawer.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/Barcode93ElementDrawer.cs
@@ -47,7 +47,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo
                 if (barcode.PrintInterpretationLine)
                 {
                     float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;
-                    SKTypeface labelTypeFace = options.FontManager.FontLoader("A");
+                    SKTypeface labelTypeFace = options.FontManager.GetFont("A");
                     SKFont labelFont = new(labelTypeFace, labelFontSize);
                     this.DrawInterpretationLine(content, labelFont, x, y, resizedImage.Width, resizedImage.Height, barcode.FieldOrigin != null, barcode.FieldOrientation, barcode.PrintInterpretationLineAboveCode, options);
                 }
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/BarcodeAnsiCodabarElementDrawer.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/BarcodeAnsiCodabarElementDrawer.cs
@@ -55,7 +55,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo
                 if (barcode.PrintInterpretationLine)
                 {
                     float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;
-                    SKTypeface labelTypeFace = options.FontManager.FontLoader("A");
+                    SKTypeface labelTypeFace = options.FontManager.GetFont("A");
                     SKFont labelFont = new(labelTypeFace, labelFontSize);
                     this.DrawInterpretationLine(interpretation, labelFont, x, y, resizedImage.Width, resizedImage.Height, barcode.FieldOrigin != null, barcode.FieldOrientation, barcode.PrintInterpretationLineAboveCode, options);
                 }
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/BarcodeEAN13ElementDrawer.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/BarcodeEAN13ElementDrawer.cs
@@ -71,7 +71,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo
                 if (barcode.PrintInterpretationLine)
                 {
                     float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;
-                    SKTypeface labelTypeFace = options.FontManager.FontLoader("A");
+                    SKTypeface labelTypeFace = options.FontManager.GetFont("A");
                     SKFont labelFont = new(labelTypeFace, labelFontSize);
                     if (barcode.PrintInterpretationLineAboveCode)
                     {
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/BarcodeUpcAElementDrawer.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/BarcodeUpcAElementDrawer.cs
@@ -80,7 +80,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo
                 if (barcode.PrintInterpretationLine)
                 {
                     float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;
-                    SKTypeface labelTypeFace = options.FontManager.FontLoader("A");
+                    SKTypeface labelTypeFace = options.FontManager.GetFont("A");
                     SKFont labelFont = new(labelTypeFace, labelFontSize);
                     if (barcode.PrintInterpretationLineAboveCode)
                     {
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/BarcodeUpcEElementDrawer.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/BarcodeUpcEElementDrawer.cs
@@ -118,7 +118,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo
                 if (barcode.PrintInterpretationLine)
                 {
                     float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;
-                    SKTypeface labelTypeFace = options.FontManager.FontLoader("A");
+                    SKTypeface labelTypeFace = options.FontManager.GetFont("A");
                     SKFont labelFont = new(labelTypeFace, labelFontSize);
                     if (barcode.PrintInterpretationLineAboveCode)
                     {
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/BarcodeUpcExtensionElementDrawer.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/BarcodeUpcExtensionElementDrawer.cs
@@ -58,7 +58,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo
                 if (barcode.PrintInterpretationLine)
                 {
                     float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;
-                    SKTypeface labelTypeFace = options.FontManager.FontLoader("A");
+                    SKTypeface labelTypeFace = options.FontManager.GetFont("A");
                     SKFont labelFont = new(labelTypeFace, labelFontSize);
                     this.DrawInterpretationLine(interpretation, labelFont, x, y, resizedImage.Width, resizedImage.Height, barcode.FieldOrigin != null, barcode.FieldOrientation, barcode.PrintInterpretationLineAboveCode, options);
                 }
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/DrawerOptions.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/DrawerOptions.cs
@@ -1,4 +1,4 @@
-using SkiaSharp;
+﻿using SkiaSharp;
 
 using System;
 
@@ -7,7 +7,10 @@ namespace BinaryKits.Zpl.Viewer.ElementDrawers
     public class DrawerOptions
     {
         [Obsolete("Use FontManager.FontLoader instead.")]
-        public Func<string, SKTypeface> FontLoader { get; set; }
+        public Func<string, SKTypeface> FontLoader {
+            get => FontManager.FontLoader;
+            set => FontManager.FontLoader = value;
+        }
 
         /// <summary>
         /// Gets or sets the image format used when rendering output.
@@ -51,7 +54,6 @@ public DrawerOptions() : this(new FontManager()) { }
         public DrawerOptions(FontManager fontManager)
         {
             this.FontManager = fontManager;
-            this.FontLoader = fontManager.FontLoader;
         }
     }
 }
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/ElementDrawerBase.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/ElementDrawerBase.cs
@@ -7,6 +7,11 @@ namespace BinaryKits.Zpl.Viewer.ElementDrawers
 {
     public abstract class ElementDrawerBase : IElementDrawer
     {
+        /// <summary>
+        /// The font to use if the specified font is not found.
+        /// </summary>
+        protected const string FallbackFont = "A";
+
         internal IPrinterStorage printerStorage;
         internal SKCanvas skCanvas;
 
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/FieldBlockElementDrawer.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/FieldBlockElementDrawer.cs
@@ -1,4 +1,4 @@
-using BinaryKits.Zpl.Label;
+﻿using BinaryKits.Zpl.Label;
 using BinaryKits.Zpl.Label.Elements;
 using BinaryKits.Zpl.Viewer.Helpers;
 
@@ -41,16 +41,18 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo
             {
                 ZplFont font = fieldBlock.Font;
 
-                (float fontSize, float scaleX) = FontScale.GetFontScaling(font.FontName, font.FontHeight, font.FontWidth, printDensityDpmm);
+                SKTypeface typeface = options.FontManager.GetFont(font.FontName, FallbackFont, out bool found);
+                string fontName = found ? font.FontName : FallbackFont;
+
+                (float fontSize, float scaleX) = FontScale.GetFontScaling(fontName, font.FontHeight, font.FontWidth, printDensityDpmm);
 
-                SKTypeface typeface = options.FontManager.FontLoader(font.FontName);
                 string text = fieldBlock.Text;
                 if (fieldBlock.HexadecimalIndicator is char hexIndicator)
                 {
                     text = text.ReplaceHexEscapes(hexIndicator, internationalFont);
                 }
 
-                if (font.FontName == "0")
+                if (fontName == "0")
                 {
                     if (options.ReplaceDashWithEnDash)
                     {
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/Interleaved2of5BarcodeDrawer.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/Interleaved2of5BarcodeDrawer.cs
@@ -1,4 +1,4 @@
-using BinaryKits.Zpl.Label;
+﻿using BinaryKits.Zpl.Label;
 using BinaryKits.Zpl.Label.Elements;
 using BinaryKits.Zpl.Viewer.Helpers;
 
@@ -53,7 +53,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo
                 if (barcode.PrintInterpretationLine)
                 {
                     float labelFontSize = Math.Min(barcode.ModuleWidth * 10f, 100f);
-                    SKTypeface labelTypeFace = options.FontManager.FontLoader("A");
+                    SKTypeface labelTypeFace = options.FontManager.GetFont("A");
                     SKFont labelFont = new(labelTypeFace, labelFontSize);
                     this.DrawInterpretationLine(content, labelFont, x, y, resizedImage.Width, resizedImage.Height, barcode.FieldOrigin != null, barcode.FieldOrientation, barcode.PrintInterpretationLineAboveCode, options);
                 }
diff --git a/src/BinaryKits.Zpl.Viewer/ElementDrawers/TextFieldElementDrawer.cs b/src/BinaryKits.Zpl.Viewer/ElementDrawers/TextFieldElementDrawer.cs
@@ -46,9 +46,10 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo
 
                 ZplFont font = textField.Font;
 
-                (float fontSize, float scaleX) = FontScale.GetFontScaling(font.FontName, font.FontHeight, font.FontWidth, printDensityDpmm);
+                SKTypeface typeface = options.FontManager.GetFont(font.FontName, FallbackFont, out bool found);
+                string fontName = found ? font.FontName : FallbackFont;
 
-                SKTypeface typeface = options.FontManager.FontLoader(font.FontName);
+                (float fontSize, float scaleX) = FontScale.GetFontScaling(fontName, font.FontHeight, font.FontWidth, printDensityDpmm);
 
                 SKFont skFont = new(typeface, fontSize, scaleX);
                 using SKPaint skPaint = new()
@@ -62,7 +63,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo
                     displayText = displayText.ReplaceHexEscapes(hexIndicator, internationalFont);
                 }
 
-                if (font.FontName == "0")
+                if (fontName == "0")
                 {
                     if (options.ReplaceDashWithEnDash)
                     {
diff --git a/src/BinaryKits.Zpl.Viewer/FontManager.cs b/src/BinaryKits.Zpl.Viewer/FontManager.cs
@@ -44,12 +44,20 @@ public class FontManager
         ];
 
         /// <summary>
-        /// Gets or sets the delegate used to load a font by name and return an SKTypeface instance.
+        /// Gets or sets the delegate used to load a font by name and return an <see cref="SKTypeface"/>.
         /// </summary>
-        /// <remarks>The delegate should accept a font name as a string and return the corresponding
-        /// SKTypeface. This property allows customization of font loading behavior, such as loading fonts from embedded
-        /// resources or external files.</remarks>
-        public Func<string, SKTypeface> FontLoader { get; set; }
+        /// <remarks>
+        /// The delegate should accept a font name as a string and return the corresponding
+        /// <see cref="SKTypeface"/>, or <see langword="null"/> if the font is not found. This property allows customization
+        /// of font loading behavior, such as loading fonts from embedded resources or external files.
+        /// </remarks>
+        public Func<string, SKTypeface> FontLoader {
+            [Obsolete("Use FontManager.GetFont instead")]
+            get => this.fontLoader; 
+            set => this.fontLoader = value ?? throw new ArgumentNullException(nameof(value)); 
+        }
+
+        private Func<string, SKTypeface> fontLoader;
 
         private static readonly SKFontStyle fontStyle0 = new(
             SKFontStyleWeight.Bold,
@@ -81,8 +89,9 @@ internal SKTypeface TypefaceA {
 
         internal SKTypeface TypefaceGS { get; } = SKTypeface.FromStream(new MemoryStream(Resources.ZplGS));
 
-        public FontManager() {
-            this.FontLoader = (fontName) => {
+        public FontManager()
+        {
+            this.fontLoader = (fontName) => {
                 if (fontName == "0")
                 {
                     return this.Typeface0;
@@ -103,7 +112,9 @@ public void RegisterTypeface(SKTypeface typeface)
             if (this.registeredTypefaces.TryGetValue(typeface.FamilyName, out IList<SKTypeface> typefaces))
             {
                 typefaces.Add(typeface);
-            } else {
+            }
+            else
+            {
                 this.registeredTypefaces[typeface.FamilyName] = [typeface];
             }
         }
@@ -157,5 +168,73 @@ private SKTypeface GetTypeFaceByFamily(string familyName, SKFontStyle fontStyle)
             return null;
         }
 
+        /// <summary>
+        /// Retrieves the typeface for <paramref name="fontName"/>.
+        /// </summary>
+        /// <returns>
+        /// The requested <see cref="SKTypeface"/>.
+        /// </returns>
+        /// <exception cref="FontNotFoundException">
+        /// If <paramref name="fontName"/> is not found.
+        /// </exception>
+        /// <inheritdoc cref="GetFont(string, string, out bool)"/>
+        public SKTypeface GetFont(string fontName)
+        {
+            return this.GetFont(fontName, null, out bool _);
+        }
+
+        /// <inheritdoc cref="GetFont(string, string, out bool)"/>
+        public SKTypeface GetFont(string fontName, string fallbackFont)
+        {
+            return this.GetFont(fontName, fallbackFont, out bool _);
+        }
+
+        /// <summary>
+        /// Tries to retrieve the typeface for <paramref name="fontName"/>, falling back to <paramref name="fallbackFont"/>
+        /// if not <see langword="null"/>.
+        /// </summary>
+        /// <param name="fontName">The name of the font to find</param>
+        /// <param name="fallbackFont">The fallback font to use if <paramref name="fontName"/> is not found</param>
+        /// <param name="found">
+        /// <see langword="true"/> if <paramref name="fontName"/> is found, <see langword="false"/> otherwise.
+        /// </param>
+        /// <returns>
+        /// The requested <see cref="SKTypeface"/> or the fallback one.
+        /// </returns>
+        /// <exception cref="FontNotFoundException">
+        /// If <paramref name="fontName"/> is not found and <paramref name="fallbackFont"/> is <see langword="null"/>
+        /// or if it is not <see langword="null"/> but not found.
+        /// </exception>
+        public SKTypeface GetFont(string fontName, string fallbackFont, out bool found)
+        {
+            SKTypeface font = this.fontLoader(fontName);
+            if (font == null)
+            {
+                found = false;
+                if (fallbackFont == null)
+                {
+                    throw new FontNotFoundException(fontName);
+                }
+
+                font = this.fontLoader(fallbackFont);
+                if (font == null)
+                {
+                    throw new FontNotFoundException(fontName, fallbackFont);
+                }
+            }
+            else
+            {
+                found = true;
+            }
+
+            return font;
+        }
+    }
+
+    public class FontNotFoundException : Exception
+    {
+        internal FontNotFoundException(string fontName) : base($"Font '{fontName}' not found") { }
+
+        internal FontNotFoundException(string fontName, string fallbackFont) : base($"Font '{fontName}' and fallback font '{fallbackFont}' not found") { }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo`
`77`	`77`	`{`
`78`	`78`	`// TODO: use font 0, auto scale for Mode D`
`79`	`79`	`float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;`
`80`		`- SKTypeface labelTypeFace = options.FontManager.FontLoader("A");`
	`80`	`+ SKTypeface labelTypeFace = options.FontManager.GetFont("A");`
`81`	`81`	`SKFont labelFont = new(labelTypeFace, labelFontSize);`
`82`	`82`	`this.DrawInterpretationLine(interpretation, labelFont, x, y, resizedImage.Width, resizedImage.Height, barcode.FieldOrigin != null, barcode.FieldOrientation, barcode.PrintInterpretationLineAboveCode, options);`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo`
`55`	`55`	`if (barcode.PrintInterpretationLine)`
`56`	`56`	`{`
`57`	`57`	`float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;`
`58`		`- SKTypeface labelTypeFace = options.FontManager.FontLoader("A");`
	`58`	`+ SKTypeface labelTypeFace = options.FontManager.GetFont("A");`
`59`	`59`	`SKFont labelFont = new(labelTypeFace, labelFontSize);`
`60`	`60`	`this.DrawInterpretationLine(interpretation, labelFont, x, y, resizedImage.Width, resizedImage.Height, barcode.FieldOrigin != null, barcode.FieldOrientation, barcode.PrintInterpretationLineAboveCode, options);`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo`
`47`	`47`	`if (barcode.PrintInterpretationLine)`
`48`	`48`	`{`
`49`	`49`	`float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;`
`50`		`- SKTypeface labelTypeFace = options.FontManager.FontLoader("A");`
	`50`	`+ SKTypeface labelTypeFace = options.FontManager.GetFont("A");`
`51`	`51`	`SKFont labelFont = new(labelTypeFace, labelFontSize);`
`52`	`52`	`this.DrawInterpretationLine(content, labelFont, x, y, resizedImage.Width, resizedImage.Height, barcode.FieldOrigin != null, barcode.FieldOrientation, barcode.PrintInterpretationLineAboveCode, options);`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo`
`71`	`71`	`if (barcode.PrintInterpretationLine)`
`72`	`72`	`{`
`73`	`73`	`float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;`
`74`		`- SKTypeface labelTypeFace = options.FontManager.FontLoader("A");`
	`74`	`+ SKTypeface labelTypeFace = options.FontManager.GetFont("A");`
`75`	`75`	`SKFont labelFont = new(labelTypeFace, labelFontSize);`
`76`	`76`	`if (barcode.PrintInterpretationLineAboveCode)`
`77`	`77`	`{`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo`
`80`	`80`	`if (barcode.PrintInterpretationLine)`
`81`	`81`	`{`
`82`	`82`	`float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;`
`83`		`- SKTypeface labelTypeFace = options.FontManager.FontLoader("A");`
	`83`	`+ SKTypeface labelTypeFace = options.FontManager.GetFont("A");`
`84`	`84`	`SKFont labelFont = new(labelTypeFace, labelFontSize);`
`85`	`85`	`if (barcode.PrintInterpretationLineAboveCode)`
`86`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo`
`118`	`118`	`if (barcode.PrintInterpretationLine)`
`119`	`119`	`{`
`120`	`120`	`float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;`
`121`		`- SKTypeface labelTypeFace = options.FontManager.FontLoader("A");`
	`121`	`+ SKTypeface labelTypeFace = options.FontManager.GetFont("A");`
`122`	`122`	`SKFont labelFont = new(labelTypeFace, labelFontSize);`
`123`	`123`	`if (barcode.PrintInterpretationLineAboveCode)`
`124`	`124`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public override SKPoint Draw(ZplElementBase element, DrawerOptions options, SKPo`
`58`	`58`	`if (barcode.PrintInterpretationLine)`
`59`	`59`	`{`
`60`	`60`	`float labelFontSize = FontScale.GetBitmappedFontSize("A", Math.Min(barcode.ModuleWidth, 10), printDensityDpmm).Value;`
`61`		`- SKTypeface labelTypeFace = options.FontManager.FontLoader("A");`
	`61`	`+ SKTypeface labelTypeFace = options.FontManager.GetFont("A");`
`62`	`62`	`SKFont labelFont = new(labelTypeFace, labelFontSize);`
`63`	`63`	`this.DrawInterpretationLine(interpretation, labelFont, x, y, resizedImage.Width, resizedImage.Height, barcode.FieldOrigin != null, barcode.FieldOrientation, barcode.PrintInterpretationLineAboveCode, options);`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using SkiaSharp;`
	`1`	`+using SkiaSharp;`
`2`	`2`
`3`	`3`	`using System;`
`4`	`4`
`@@ -7,7 +7,10 @@ namespace BinaryKits.Zpl.Viewer.ElementDrawers`
`7`	`7`	`public class DrawerOptions`
`8`	`8`	`{`
`9`	`9`	`[Obsolete("Use FontManager.FontLoader instead.")]`
`10`		`- public Func<string, SKTypeface> FontLoader { get; set; }`
	`10`	`+ public Func<string, SKTypeface> FontLoader {`
	`11`	`+ get => FontManager.FontLoader;`
	`12`	`+ set => FontManager.FontLoader = value;`
	`13`	`+ }`
`11`	`14`
`12`	`15`	`/// <summary>`
`13`	`16`	`/// Gets or sets the image format used when rendering output.`
`@@ -51,7 +54,6 @@ public DrawerOptions() : this(new FontManager()) { }`
`51`	`54`	`public DrawerOptions(FontManager fontManager)`
`52`	`55`	`{`
`53`	`56`	`this.FontManager = fontManager;`
`54`		`- this.FontLoader = fontManager.FontLoader;`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,11 @@ namespace BinaryKits.Zpl.Viewer.ElementDrawers`
`7`	`7`	`{`
`8`	`8`	`public abstract class ElementDrawerBase : IElementDrawer`
`9`	`9`	`{`
	`10`	`+ /// <summary>`
	`11`	`+ /// The font to use if the specified font is not found.`
	`12`	`+ /// </summary>`
	`13`	`+ protected const string FallbackFont = "A";`
	`14`	`+`
`10`	`15`	`internal IPrinterStorage printerStorage;`
`11`	`16`	`internal SKCanvas skCanvas;`
`12`	`17`