Merge remote-tracking branch 'origin/master'

This commit is contained in:
2026-02-16 14:55:06 +03:00
parent 9ce85ff6b8
commit 5a6350250a

View File

@@ -87,7 +87,7 @@ func resolveAssetPath(fileName string, relativeDirs []string) (string, error) {
return "", fmt.Errorf("asset not found: %s (tried: %s)", fileName, strings.Join(tried, ", ")) return "", fmt.Errorf("asset not found: %s (tried: %s)", fileName, strings.Join(tried, ", "))
} }
func registerDejavuFonts(pdf *gofpdf.Fpdf, regularFamily, boldFamily string) error { func registerDejavuFonts(pdf *gofpdf.Fpdf) error {
regPath, err := resolvePdfAssetPath("DejaVuSans.ttf") regPath, err := resolvePdfAssetPath("DejaVuSans.ttf")
if err != nil { if err != nil {
@@ -99,20 +99,19 @@ func registerDejavuFonts(pdf *gofpdf.Fpdf, regularFamily, boldFamily string) err
return err return err
} }
// Load fonts from bytes // SAME FAMILY: "dejavu"
pdf.AddUTF8FontFromBytes( pdf.AddUTF8FontFromBytes(
regularFamily, "dejavu",
"", "",
mustReadFile(regPath), mustReadFile(regPath),
) )
pdf.AddUTF8FontFromBytes( pdf.AddUTF8FontFromBytes(
boldFamily, "dejavu",
"B", "B",
mustReadFile(boldPath), mustReadFile(boldPath),
) )
// Check internal PDF error
if pdf.Error() != nil { if pdf.Error() != nil {
return fmt.Errorf("font init failed: %w", pdf.Error()) return fmt.Errorf("font init failed: %w", pdf.Error())
} }