Merge branch 'main' of github.com:klippa-app/go-pdfium

Author: jerbob92

internal/implementation_cgo/text_experimental.go

@@ -10,6 +10,7 @@ import "C"
 
 import (
 	"bytes"
+	"math"
 	"unsafe"
 
 	"github.com/klippa-app/go-pdfium/responses"
@@ -35,10 +36,19 @@ func (p *PdfiumImplementation) getFontInformation(textPage C.FPDF_TEXTPAGE, char
 		fontName = string(bytes.TrimSuffix(rawFontName, []byte("\x00")))
 	}
 
+	renderedSize := float64(fontSize)
+
+	matrix := C.FS_MATRIX{}
+	success := C.FPDFText_GetMatrix(textPage, C.int(charIndex), &matrix)
+	if int(success) != 0 {
+		renderedSize = float64(fontSize) * math.Sqrt(float64(matrix.c)*float64(matrix.c)+float64(matrix.d)*float64(matrix.d))
+	}
+
 	return &responses.FontInformation{
-		Size:   float64(fontSize),
-		Weight: int(fontWeight),
-		Name:   fontName,
-		Flags:  int(fontFlags),
+		Size:         float64(fontSize),
+		RenderedSize: renderedSize,
+		Weight:       int(fontWeight),
+		Name:         fontName,
+		Flags:        int(fontFlags),
 	}
 }

internal/implementation_cgo/text_no_experimental.go

@@ -16,6 +16,7 @@ func (p *PdfiumImplementation) getFontInformation(textPage C.FPDF_TEXTPAGE, char
 	fontSize := C.FPDFText_GetFontSize(textPage, C.int(charIndex))
 
 	return &responses.FontInformation{
-		Size: float64(fontSize),
+		Size:         float64(fontSize),
+		RenderedSize: float64(fontSize),
 	}
 }

internal/implementation_webassembly/text.go

@@ -436,10 +436,29 @@ func (p *PdfiumImplementation) getFontInformation(textPage uint64, charIndex int
 		return nil, err
 	}
 
+	renderedSize := fontSize
+
+	matrixPointer, matrixValue, err := p.CStructFS_MATRIX(nil)
+	if err == nil {
+		defer p.Free(matrixPointer)
+
+		res, err = p.Module.ExportedFunction("FPDFText_GetMatrix").Call(p.Context, textPage, *(*uint64)(unsafe.Pointer(&charIndex)), matrixPointer)
+		if err == nil {
+			success := *(*int32)(unsafe.Pointer(&res[0]))
+			if int(success) != 0 {
+				matrix, err := matrixValue()
+				if err == nil {
+					renderedSize = fontSize * math.Sqrt(float64(matrix.C)*float64(matrix.C)+float64(matrix.D)*float64(matrix.D))
+				}
+			}
+		}
+	}
+
 	return &responses.FontInformation{
-		Size:   float64(fontSize),
-		Weight: int(fontWeight),
-		Name:   fontName,
-		Flags:  int(fontFlags),
+		Size:         float64(fontSize),
+		RenderedSize: renderedSize,
+		Weight:       int(fontWeight),
+		Name:         fontName,
+		Flags:        int(fontFlags),
 	}, nil
 }

responses/text.go

@@ -13,11 +13,12 @@ type CharPosition struct {
 }
 
 type FontInformation struct {
-	Size         float64 // Font size in points (also known as em).
-	SizeInPixels *int    // Font size in pixels, only available when PixelPositions is used.
-	Weight       int     // The weight of the font, can be negative for spaces and newlines. Will only be filled when compiled with experimental support.
-	Name         string  // The name of the font, can be empty for spaces and newlines. Will only be filled when compiled with experimental support.
-	Flags        int     // Font flags, should be interpreted per PDF spec 1.7, Section 5.7.1 Font Descriptor Flags. Will only be filled when compiled with experimental support.
+	Size         float64  // Font size in points (also known as em).
+	RenderedSize float64  // The effective rendered size: fontSize * sqrt(C² + D²) where C,D come from the text transformation matrix (FPDFText_GetMatrix). Falls back to Size when experimental support is not available.
+	SizeInPixels *int     // Font size in pixels, only available when PixelPositions is used.
+	Weight       int      // The weight of the font, can be negative for spaces and newlines. Will only be filled when compiled with experimental support.
+	Name         string   // The name of the font, can be empty for spaces and newlines. Will only be filled when compiled with experimental support.
+	Flags        int      // Font flags, should be interpreted per PDF spec 1.7, Section 5.7.1 Font Descriptor Flags. Will only be filled when compiled with experimental support.
 }
 
 type GetPageTextStructuredChar struct {