v0.0.498

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.496"
+const GoextVersion = "0.0.498"
 
-const GoextVersionTimestamp = "2024-08-07T15:34:06+0200"
+const GoextVersionTimestamp = "2024-08-07T17:26:35+0200"

wpdf/wpdf.go

@@ -245,6 +245,10 @@ func (b *WPDFBuilder) PageNo() int {
 	return b.b.PageNo()
 }
 
+func (b *WPDFBuilder) Bookmark(txtStr string, level int, y float64) {
+	b.b.Bookmark(b.tr(txtStr), level, y)
+}
+
 func (b *WPDFBuilder) GetStringWidth(str string, opts ...PDFCellOpt) float64 {
 
 	var fontNameOverride *PDFFontFamily

wpdf/wpdfTable.go

@@ -289,23 +289,28 @@ func (b *TableBuilder) calculateColumns() []float64 {
 		return columnWidths
 	}
 
-	for i, _ := range columnDef {
-		if frColumnWeights[i] != 0 {
-			w := min(autoWidths[i], (remainingWidth/float64(frColumnWidthCount))*frColumnWeights[i])
-			remainingWidth += columnWidths[i]
-			columnWidths[i] = w
-			remainingWidth -= w
+	{
+		rmSub := 0.0
+		for i := range columnDef {
+			if frColumnWeights[i] != 0 {
+				w := min(autoWidths[i], (remainingWidth/float64(frColumnWidthCount))*frColumnWeights[i])
+				rmSub += w - columnWidths[i]
+				columnWidths[i] = w
+			}
 		}
+		remainingWidth -= rmSub
 	}
 
-	if remainingWidth > 0 {
+	if remainingWidth > 0.01 {
+		rmSub := 0.0
 		for i, _ := range columnDef {
 			if frColumnWeights[i] != 0 {
 				addW := (remainingWidth / float64(frColumnWidthCount)) * frColumnWeights[i]
+				rmSub += addW
 				columnWidths[i] += addW
-				remainingWidth -= addW
 			}
 		}
+		remainingWidth -= rmSub
 	}
 
 	return columnWidths