Browse Source

Updated the Lato font to version 2.015. Font files are no longer provided as embedded resources, rather they are copied to the application directory (not tested)

Marcin Ziąbek 1 year ago
parent
commit
b8e48f7ec3
31 changed files with 15 additions and 24 deletions
  1. 7 22
      Source/QuestPDF/Drawing/FontManager.cs
  2. BIN
      Source/QuestPDF/Lato/Lato-Black.ttf
  3. BIN
      Source/QuestPDF/Lato/Lato-BlackItalic.ttf
  4. BIN
      Source/QuestPDF/Lato/Lato-Bold.ttf
  5. BIN
      Source/QuestPDF/Lato/Lato-BoldItalic.ttf
  6. BIN
      Source/QuestPDF/Lato/Lato-ExtraBold.ttf
  7. BIN
      Source/QuestPDF/Lato/Lato-ExtraBoldItalic.ttf
  8. BIN
      Source/QuestPDF/Lato/Lato-ExtraLight.ttf
  9. BIN
      Source/QuestPDF/Lato/Lato-ExtraLightItalic.ttf
  10. BIN
      Source/QuestPDF/Lato/Lato-Italic.ttf
  11. BIN
      Source/QuestPDF/Lato/Lato-Light.ttf
  12. BIN
      Source/QuestPDF/Lato/Lato-LightItalic.ttf
  13. BIN
      Source/QuestPDF/Lato/Lato-Medium.ttf
  14. BIN
      Source/QuestPDF/Lato/Lato-MediumItalic.ttf
  15. BIN
      Source/QuestPDF/Lato/Lato-Regular.ttf
  16. BIN
      Source/QuestPDF/Lato/Lato-SemiBold.ttf
  17. BIN
      Source/QuestPDF/Lato/Lato-SemiBoldItalic.ttf
  18. BIN
      Source/QuestPDF/Lato/Lato-Thin.ttf
  19. BIN
      Source/QuestPDF/Lato/Lato-ThinItalic.ttf
  20. 0 0
      Source/QuestPDF/Lato/OFL.txt
  21. 8 2
      Source/QuestPDF/QuestPDF.csproj
  22. BIN
      Source/QuestPDF/Resources/DefaultFont/Lato-Black.ttf
  23. BIN
      Source/QuestPDF/Resources/DefaultFont/Lato-BlackItalic.ttf
  24. BIN
      Source/QuestPDF/Resources/DefaultFont/Lato-Bold.ttf
  25. BIN
      Source/QuestPDF/Resources/DefaultFont/Lato-BoldItalic.ttf
  26. BIN
      Source/QuestPDF/Resources/DefaultFont/Lato-Italic.ttf
  27. BIN
      Source/QuestPDF/Resources/DefaultFont/Lato-Light.ttf
  28. BIN
      Source/QuestPDF/Resources/DefaultFont/Lato-LightItalic.ttf
  29. BIN
      Source/QuestPDF/Resources/DefaultFont/Lato-Regular.ttf
  30. BIN
      Source/QuestPDF/Resources/DefaultFont/Lato-Thin.ttf
  31. BIN
      Source/QuestPDF/Resources/DefaultFont/Lato-ThinItalic.ttf

+ 7 - 22
Source/QuestPDF/Drawing/FontManager.cs

@@ -73,30 +73,15 @@ namespace QuestPDF.Drawing
         
         
         private static void RegisterLibraryDefaultFonts()
         private static void RegisterLibraryDefaultFonts()
         {
         {
-            var fontFileNames = new[]
-            {
-                "Lato-Black.ttf",
-                "Lato-BlackItalic.ttf",
-                
-                "Lato-Bold.ttf",
-                "Lato-BoldItalic.ttf",
-                
-                "Lato-Regular.ttf",
-                "Lato-Italic.ttf",
-                
-                "Lato-Light.ttf",
-                "Lato-LightItalic.ttf",
-                
-                "Lato-Thin.ttf",
-                "Lato-ThinItalic.ttf"
-            };
+            var executionPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+
+            var fontDirectory = Path.Combine(executionPath, "LatoFont");
+            var fontFilePaths = Directory.GetFiles(fontDirectory, "*.ttf");
             
             
-            foreach (var fileName in fontFileNames)
+            foreach (var fileName in fontFilePaths)
             {
             {
-                var filePath = $"QuestPDF.Resources.DefaultFont.{fileName}";
-                
-                using var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(filePath);
-                RegisterFont(stream);
+                using var fontFileStream = File.OpenRead(fileName);
+                RegisterFont(fontFileStream);
             }
             }
         }
         }
     }
     }

BIN
Source/QuestPDF/Lato/Lato-Black.ttf


BIN
Source/QuestPDF/Lato/Lato-BlackItalic.ttf


BIN
Source/QuestPDF/Lato/Lato-Bold.ttf


BIN
Source/QuestPDF/Lato/Lato-BoldItalic.ttf


BIN
Source/QuestPDF/Lato/Lato-ExtraBold.ttf


BIN
Source/QuestPDF/Lato/Lato-ExtraBoldItalic.ttf


BIN
Source/QuestPDF/Lato/Lato-ExtraLight.ttf


BIN
Source/QuestPDF/Lato/Lato-ExtraLightItalic.ttf


BIN
Source/QuestPDF/Lato/Lato-Italic.ttf


BIN
Source/QuestPDF/Lato/Lato-Light.ttf


BIN
Source/QuestPDF/Lato/Lato-LightItalic.ttf


BIN
Source/QuestPDF/Lato/Lato-Medium.ttf


BIN
Source/QuestPDF/Lato/Lato-MediumItalic.ttf


BIN
Source/QuestPDF/Lato/Lato-Regular.ttf


BIN
Source/QuestPDF/Lato/Lato-SemiBold.ttf


BIN
Source/QuestPDF/Lato/Lato-SemiBoldItalic.ttf


BIN
Source/QuestPDF/Lato/Lato-Thin.ttf


BIN
Source/QuestPDF/Lato/Lato-ThinItalic.ttf


+ 0 - 0
Source/QuestPDF/Resources/DefaultFont/OFL.txt → Source/QuestPDF/Lato/OFL.txt


+ 8 - 2
Source/QuestPDF/QuestPDF.csproj

@@ -33,10 +33,16 @@
     </ItemGroup>
     </ItemGroup>
 
 
     <ItemGroup>
     <ItemGroup>
-        <EmbeddedResource Include="Resources\**\*.*">
+        <None Include="Resources\**\*.*">
+            <Pack>true</Pack>
+            <PackagePath>%(RecursiveDir)\%(Filename)%(Extension)</PackagePath>
+        </None>
+        
+        <None Include="LatoFont\*.*">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Pack>true</Pack>
             <Pack>true</Pack>
             <PackagePath>%(RecursiveDir)%(Filename)%(Extension)</PackagePath>
             <PackagePath>%(RecursiveDir)%(Filename)%(Extension)</PackagePath>
-        </EmbeddedResource>
+        </None>
 
 
         <None Include="runtimes\**\*.*">
         <None Include="runtimes\**\*.*">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

BIN
Source/QuestPDF/Resources/DefaultFont/Lato-Black.ttf


BIN
Source/QuestPDF/Resources/DefaultFont/Lato-BlackItalic.ttf


BIN
Source/QuestPDF/Resources/DefaultFont/Lato-Bold.ttf


BIN
Source/QuestPDF/Resources/DefaultFont/Lato-BoldItalic.ttf


BIN
Source/QuestPDF/Resources/DefaultFont/Lato-Italic.ttf


BIN
Source/QuestPDF/Resources/DefaultFont/Lato-Light.ttf


BIN
Source/QuestPDF/Resources/DefaultFont/Lato-LightItalic.ttf


BIN
Source/QuestPDF/Resources/DefaultFont/Lato-Regular.ttf


BIN
Source/QuestPDF/Resources/DefaultFont/Lato-Thin.ttf


BIN
Source/QuestPDF/Resources/DefaultFont/Lato-ThinItalic.ttf