refactor(重构代码): 提升代码质量

go.mod

@@ -3,15 +3,16 @@ module github.com/xiaoqidun/ofdgo
 go 1.25.0
 
 require (
-	github.com/tdewolff/canvas v0.0.0-20260707223012-a1cbc6a74235
+	github.com/tdewolff/canvas v0.0.0-20260708151538-b3beae08c578
-	github.com/xiaoqidun/jbig2 v0.0.0-20260707061149-c2ff34658234
+	github.com/tdewolff/font v0.0.0-20260527091451-1663e68cb8a4
-	golang.org/x/image v0.43.0
+	github.com/xiaoqidun/jbig2 v0.0.0-20260709020415-1bb076bd002c
-	golang.org/x/text v0.39.0
+	golang.org/x/image v0.44.0
+	golang.org/x/text v0.40.0
 )
 
 require (
-	codeberg.org/go-latex/latex v0.2.0 // indirect
+	codeberg.org/go-latex/latex v0.3.0 // indirect
-	codeberg.org/go-pdf/fpdf v0.11.1 // indirect
+	codeberg.org/go-pdf/fpdf v0.12.0 // indirect
 	github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 // indirect
 	github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 // indirect
 	github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc // indirect
@@ -27,12 +28,11 @@ require (
 	github.com/kolesa-team/go-webp v1.0.5 // indirect
 	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
 	github.com/srwiley/scanx v0.0.0-20190309010443-e94503791388 // indirect
-	github.com/tdewolff/font v0.0.0-20260424075104-b5eeb1e23189 // indirect
 	github.com/tdewolff/minify/v2 v2.24.13 // indirect
-	github.com/tdewolff/parse/v2 v2.8.12 // indirect
+	github.com/tdewolff/parse/v2 v2.8.13 // indirect
 	github.com/wcharczuk/go-chart/v2 v2.1.2 // indirect
 	github.com/yuin/goldmark v1.8.2 // indirect
-	golang.org/x/net v0.53.0 // indirect
+	golang.org/x/net v0.55.0 // indirect
 	gonum.org/v1/plot v0.17.0 // indirect
 	modernc.org/knuth v0.5.5 // indirect
 	modernc.org/token v1.1.0 // indirect

go.sum

@@ -2,10 +2,10 @@ codeberg.org/go-fonts/dejavu v0.4.0 h1:2yn58Vkh4CFK3ipacWUAIE3XVBGNa0y1bc95Bmfx9
 codeberg.org/go-fonts/dejavu v0.4.0/go.mod h1:abni088lmhQJvso2Lsb7azCKzwkfcnttl6tL1UTWKzg=
 codeberg.org/go-fonts/liberation v0.5.0 h1:SsKoMO1v1OZmzkG2DY+7ZkCL9U+rrWI09niOLfQ5Bo0=
 codeberg.org/go-fonts/liberation v0.5.0/go.mod h1:zS/2e1354/mJ4pGzIIaEtm/59VFCFnYC7YV6YdGl5GU=
-codeberg.org/go-latex/latex v0.2.0 h1:Ol/a6VHY06N+5gPfewswymoRb5ZcKDXWVaVegcx4hbI=
+codeberg.org/go-latex/latex v0.3.0 h1:LKTaDHFbEC2PH1sh0sYv6PZ1pzs/g2aoeV1HItWj/bg=
-codeberg.org/go-latex/latex v0.2.0/go.mod h1:VJAwQir7/T8LZxj7xAPivISKiVOwkMpQ8bTuPQ31X0Y=
+codeberg.org/go-latex/latex v0.3.0/go.mod h1:8ETijTpK2bFtwRAXLXe1RZJrYxnc5pibibZfQBj+Lk4=
-codeberg.org/go-pdf/fpdf v0.11.1 h1:U8+coOTDVLxHIXZgGvkfQEi/q0hYHYvEHFuGNX2GzGs=
+codeberg.org/go-pdf/fpdf v0.12.0 h1:g8E/1VqGqB2lZUUaqQrrTnA0IEJLPTTX1DZ0qS/ZmhU=
-codeberg.org/go-pdf/fpdf v0.11.1/go.mod h1:Y0DGRAdZ0OmnZPvjbMp/1bYxmIPxm0ws4tfoPOc4LjU=
+codeberg.org/go-pdf/fpdf v0.12.0/go.mod h1:WJNJ2bvCj81rZBdhOf7lKOGoSl+OKMXcIcXqDcP8r5Y=
 git.sr.ht/~sbinet/cmpimg v0.1.0 h1:E0zPRk2muWuCqSKSVZIWsgtU9pjsw3eKHi8VmQeScxo=
 git.sr.ht/~sbinet/cmpimg v0.1.0/go.mod h1:FU12psLbF4TfNXkKH2ZZQ29crIqoiqTZmeQ7dkp/pxE=
 git.sr.ht/~sbinet/gg v0.7.0 h1:YmNf7YKd7diDMTPm86hZa1EM3pbkOyD/zzjl0LZUdNM=
@@ -61,21 +61,20 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/tdewolff/canvas v0.0.0-20260707223012-a1cbc6a74235 h1:h2FIMfIs+VEJltMADi0Vh8UwvoJ+34gLhfn77peMX0U=
+github.com/tdewolff/canvas v0.0.0-20260708151538-b3beae08c578 h1:OKVthD6KmBTDWsxnPkmDLW35yp+lvoqWsMeteXOZW+4=
-github.com/tdewolff/canvas v0.0.0-20260707223012-a1cbc6a74235/go.mod h1:Lz12ClttuKvo2jb1UxBfJJWmKV0LmEc8IRo/30R7z+k=
+github.com/tdewolff/canvas v0.0.0-20260708151538-b3beae08c578/go.mod h1:Lz12ClttuKvo2jb1UxBfJJWmKV0LmEc8IRo/30R7z+k=
-github.com/tdewolff/font v0.0.0-20260424075104-b5eeb1e23189 h1:wP/+8oeXiF55DUy9U0BP4iDD2mNu+o7evt5QLbLHv9E=
+github.com/tdewolff/font v0.0.0-20260527091451-1663e68cb8a4 h1:QmSG/RtOlLPJDLJ24XHSDEu4iSgcG+s9sdRg7wTdfpk=
-github.com/tdewolff/font v0.0.0-20260424075104-b5eeb1e23189/go.mod h1:KjNTiF0TXOXJyWGS/0DPXRknEC20c12kc0JcCYNqtz4=
+github.com/tdewolff/font v0.0.0-20260527091451-1663e68cb8a4/go.mod h1:tQzLTuJVLs4Pp6Vxdn3PJ7sAe4gIuph3SBm/BmdlmR0=
 github.com/tdewolff/minify/v2 v2.24.13 h1:xrcF7gKDnUszseEY9WX9mUlZII2v2Go/QAcAwRASw58=
 github.com/tdewolff/minify/v2 v2.24.13/go.mod h1:emvwoYeIl8bfAKqRU5ww95LX9Gpggpqv/naal9a8Yq0=
-github.com/tdewolff/parse/v2 v2.8.12 h1:5BBjfaCv482v3nltlS0u6wH1xJaxjR6ofDrWttNvROg=
+github.com/tdewolff/parse/v2 v2.8.13 h1:si/8rLw5BZZTWCCiMm9A3f6x+RmqYfrkEeXCgpX5ick=
-github.com/tdewolff/parse/v2 v2.8.12/go.mod h1:Hwlni2tiVNKyzR1o6nUs4FOF07URA+JLBLd6dlIXYqo=
+github.com/tdewolff/parse/v2 v2.8.13/go.mod h1:XdsoSFThlVIRIajAuqz1evNY7bagZS8LBOPA3aVopwQ=
-github.com/tdewolff/test v1.0.11/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8=
 github.com/tdewolff/test v1.0.12 h1:7F21DqIajswxuche0geHdrUZRCWE4oko4b7bcmkkrxk=
 github.com/tdewolff/test v1.0.12/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8=
 github.com/wcharczuk/go-chart/v2 v2.1.2 h1:Y17/oYNuXwZg6TFag06qe8sBajwwsuvPiJJXcUcLL6E=
 github.com/wcharczuk/go-chart/v2 v2.1.2/go.mod h1:Zi4hbaqlWpYajnXB2K22IUYVXRXaLfSGNNR7P4ukyyQ=
-github.com/xiaoqidun/jbig2 v0.0.0-20260707061149-c2ff34658234 h1:aTUfzcRBfRYrEX0gxWRRQJGd/z9LJTu15eFC9pNVT00=
+github.com/xiaoqidun/jbig2 v0.0.0-20260709020415-1bb076bd002c h1:6onRnslTNM7nVlnS215tsUT6WHF1LL58K+5hVn7wDYo=
-github.com/xiaoqidun/jbig2 v0.0.0-20260707061149-c2ff34658234/go.mod h1:c5zFNbM18iSRcfS9ziMZquU3lFJGmN1w6CUfuEDw0WI=
+github.com/xiaoqidun/jbig2 v0.0.0-20260709020415-1bb076bd002c/go.mod h1:4ieZvd1EYR3zUzaAT4H8vLDb6XO+yjnxuh33So/5iC4=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -88,8 +87,8 @@ golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDf
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/image v0.0.0-20210504121937-7319ad40d33e/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
-golang.org/x/image v0.43.0 h1:FLxcP4ec2350nTfOC8ysKtqYSIFbk/QGjw1ZHNP4tsY=
+golang.org/x/image v0.44.0 h1:+tDekMZED9+LrtB3G5xzRggpVh9CARjZqROla3R3R+I=
-golang.org/x/image v0.43.0/go.mod h1:rrpelvGFt+kLPAjPM4HeWPgrl0FtafueU//e5N0qk/Q=
+golang.org/x/image v0.44.0/go.mod h1:V8K3KE9KKKE+pLpQDOeN18w9oacNSvy1tDOirTu4xtY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
@@ -104,8 +103,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
-golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
+golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -141,8 +140,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
-golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus=
+golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
-golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM=
+golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

ofdgo_font_info.go

@@ -331,35 +331,7 @@ func (r *Renderer) countCompositeFonts(cgu CompositeGraphicUnit, usage map[strin
 // countTextFont 统计文本字体使用次数
 // 入参: text 文本对象, usage 字体使用次数
 func (r *Renderer) countTextFont(text TextObject, usage map[string]int) {
-	fontID := text.Font
+	if fontID := r.textObjectFontID(text); fontID != "" {
-	if fontID == "" && text.DrawParam != "" {
-		fontID = r.drawParamFont(text.DrawParam, nil)
-	}
-	if fontID != "" {
 		usage[fontID]++
 	}
 }
-
-// drawParamFont 获取绘制参数字体
-// 入参: id 绘制参数ID, visited 已访问绘制参数
-// 返回: string 字体ID
-func (r *Renderer) drawParamFont(id string, visited map[string]bool) string {
-	if id == "" {
-		return ""
-	}
-	if visited == nil {
-		visited = make(map[string]bool)
-	}
-	if visited[id] {
-		return ""
-	}
-	visited[id] = true
-	dp := r.DrawParams[id]
-	if dp == nil {
-		return ""
-	}
-	if dp.Font != "" {
-		return dp.Font
-	}
-	return r.drawParamFont(dp.Relative, visited)
-}

ofdgo_image.go

@@ -20,6 +20,9 @@ import (
 	"fmt"
 	"image"
 	"image/color"
+
+	_ "github.com/xiaoqidun/jbig2"
+	_ "golang.org/x/image/bmp"
 )
 
 // decodeImageData 解码图片数据

ofdgo_paint.go

@@ -225,6 +225,16 @@ func parseStrokePaint(strokeColor *StrokeColor, x, y, pageH, originX, originY fl
 	return nil
 }
 
+// patternColor 获取图案单元默认颜色
+// 入参: fillColor 填充颜色节点
+// 返回: color.Color 默认颜色
+func patternColor(fillColor *FillColor) color.Color {
+	if fillColor == nil || strings.TrimSpace(fillColor.Value) == "" {
+		return nil
+	}
+	return parseColorWithAlpha(fillColor.Value, fillColor.Alpha)
+}
+
 // parseAxialShdColor 解析轴向渐变颜色
 // 入参: axialShd 轴向渐变节点, alpha 透明度
 // 返回: color.Color 颜色对象

ofdgo_renderer.go

@@ -29,8 +29,6 @@ import (
 	"github.com/tdewolff/canvas/renderers"
 	"github.com/tdewolff/canvas/renderers/pdf"
 	"github.com/tdewolff/canvas/renderers/rasterizer"
-	_ "github.com/xiaoqidun/jbig2"
-	_ "golang.org/x/image/bmp"
 )
 
 // Renderer 渲染器实现
@@ -306,19 +304,7 @@ func (r *Renderer) renderTemplate(ctx *canvas.Context, templateID string, pageH
 // renderLayer 渲染图层
 // 入参: ctx 画布上下文, layer 图层对象, pageH 页面高度, defaultFill 默认填充色, defaultStroke 默认描边色, defaultLW 默认线宽, parentCTM 父级CTM
 func (r *Renderer) renderLayer(ctx *canvas.Context, layer Layer, pageH float64, defaultFill, defaultStroke color.Color, defaultLW float64, parentCTM *Matrix) {
-	if layer.DrawParam != "" {
+	defaultFill, defaultStroke, defaultLW = r.drawParamDefaults(layer.DrawParam, defaultFill, defaultStroke, defaultLW)
-		if dp := r.getDrawParam(layer.DrawParam, nil); dp != nil {
-			if dp.LineWidth > 0 {
-				defaultLW = dp.LineWidth
-			}
-			if dp.FillColor != nil {
-				defaultFill = parseFillColor(dp.FillColor)
-			}
-			if dp.StrokeColor != nil {
-				defaultStroke = parseStrokeColor(dp.StrokeColor)
-			}
-		}
-	}
 	if len(layer.Objects) > 0 {
 		for _, obj := range layer.Objects {
 			r.renderObject(ctx, obj, pageH, defaultFill, defaultStroke, defaultLW, parentCTM, false)
@@ -357,19 +343,7 @@ func (r *Renderer) renderCompositeGraphicUnit(ctx *canvas.Context, cgu Composite
 			r.renderCompositeGraphicUnit(ctx, refCopy, pageH, defaultFill, defaultStroke, defaultLW, &currentCTM, true)
 		}
 	}
-	if cgu.DrawParam != "" {
+	defaultFill, defaultStroke, defaultLW = r.drawParamDefaults(cgu.DrawParam, defaultFill, defaultStroke, defaultLW)
-		if dp := r.getDrawParam(cgu.DrawParam, nil); dp != nil {
-			if dp.LineWidth > 0 {
-				defaultLW = dp.LineWidth
-			}
-			if dp.FillColor != nil {
-				defaultFill = parseFillColor(dp.FillColor)
-			}
-			if dp.StrokeColor != nil {
-				defaultStroke = parseStrokeColor(dp.StrokeColor)
-			}
-		}
-	}
 	if len(cgu.Objects) > 0 {
 		for _, obj := range cgu.Objects {
 			obj = mergeGraphicObjectAlpha(obj, cgu.Alpha)
@@ -432,6 +406,29 @@ func mergeGraphicObjectAlpha(obj GraphicObject, alpha *int) GraphicObject {
 	return obj
 }
 
+// drawParamDefaults 合并绘制参数默认样式
+// 入参: id 绘制参数ID, defaultFill 默认填充色, defaultStroke 默认描边色, defaultLW 默认线宽
+// 返回: color.Color 默认填充色, color.Color 默认描边色, float64 默认线宽
+func (r *Renderer) drawParamDefaults(id string, defaultFill, defaultStroke color.Color, defaultLW float64) (color.Color, color.Color, float64) {
+	if id == "" {
+		return defaultFill, defaultStroke, defaultLW
+	}
+	dp := r.getDrawParam(id, nil)
+	if dp == nil {
+		return defaultFill, defaultStroke, defaultLW
+	}
+	if dp.LineWidth > 0 {
+		defaultLW = dp.LineWidth
+	}
+	if dp.FillColor != nil {
+		defaultFill = parseFillColor(dp.FillColor)
+	}
+	if dp.StrokeColor != nil {
+		defaultStroke = parseStrokeColor(dp.StrokeColor)
+	}
+	return defaultFill, defaultStroke, defaultLW
+}
+
 // getDrawParam 获取绘制参数逻辑
 // 入参: id 参数ID, visited 访问记录
 // 返回: *DrawParam 绘制参数
@@ -744,16 +741,6 @@ func (r *Renderer) renderPattern(ctx *canvas.Context, pattern *Pattern, defaultC
 	}
 }
 
-// patternColor 获取图案单元默认颜色
-// 入参: fillColor 填充颜色节点
-// 返回: color.Color 默认颜色
-func patternColor(fillColor *FillColor) color.Color {
-	if fillColor == nil || strings.TrimSpace(fillColor.Value) == "" {
-		return nil
-	}
-	return parseColorWithAlpha(fillColor.Value, fillColor.Alpha)
-}
-
 // renderText 渲染文本
 // 入参: ctx 画布上下文, obj 文本对象, pageH 页面高度, defaultFill 默认填充色, defaultStroke 默认描边色, parentCTM 父级CTM, boundaryInCTM 边界是否参与父级CTM
 func (r *Renderer) renderText(ctx *canvas.Context, obj TextObject, pageH float64, defaultFill, defaultStroke color.Color, parentCTM *Matrix, boundaryInCTM bool) {
@@ -850,6 +837,8 @@ func (r *Renderer) renderText(ctx *canvas.Context, obj TextObject, pageH float64
 	}
 	face := ff.Face(sizePt, fillPaint, fontStyle, canvas.FontNormal)
 	glyphTransforms := r.textObjectGlyphTransforms(fontID, obj)
+	hasUnderline := strings.Contains(obj.Decoration, "Underline")
+	useGlyphFillPaint := fillColorNode != nil && fillColorNode.AxialShd != nil
 	codePos := 0
 	for _, tc := range obj.TextCode {
 		var runes []rune
@@ -863,7 +852,7 @@ func (r *Renderer) renderText(ctx *canvas.Context, obj TextObject, pageH float64
 		}
 		dxs, dys := parseFloats(tc.DeltaX), parseFloats(tc.DeltaY)
 		xs, ys := parseFloats(tc.X), parseFloats(tc.Y)
-		drawAsPath := embeddedFont || textCodePositioned(tc)
+		drawAsPath := embeddedFont || textCodePositioned(tc, xs, ys)
 		cx, cy := 0.0, 0.0
 		if len(xs) > 0 {
 			cx = xs[0]
@@ -900,7 +889,7 @@ func (r *Renderer) renderText(ctx *canvas.Context, obj TextObject, pageH float64
 			}
 			textWidth := textGlyphWidth(face, glyph) * hScale
 			glyphFillPaint := fillPaint
-			if fillColorNode != nil && fillColorNode.AxialShd != nil {
+			if useGlyphFillPaint {
 				glyphFillPaint = parseFillPaint(fillColorNode, bx, by, pageH, canvasX, canvasY)
 			}
 			advanceLimit := textGlyphAdvanceLimit(dxs, dys, xs, i, len(glyphs), cx)
@@ -932,7 +921,7 @@ func (r *Renderer) renderText(ctx *canvas.Context, obj TextObject, pageH float64
 							x, y = 0, 0
 						}
 						textFace := face
-						if fillColorNode != nil && fillColorNode.AxialShd != nil {
+						if useGlyphFillPaint {
 							textFace = ff.Face(sizePt, glyphFillPaint, fontStyle, canvas.FontNormal)
 						}
 						text := canvas.NewTextLine(textFace, str, canvas.Left)
@@ -947,7 +936,7 @@ func (r *Renderer) renderText(ctx *canvas.Context, obj TextObject, pageH float64
 					ctx.Translate(canvasX, canvasY)
 					ctx.ComposeView(textMatrix(ctm))
 					drawGlyph(0, 0)
-					if strings.Contains(obj.Decoration, "Underline") {
+					if hasUnderline {
 						uw := sizeMM * 0.05
 						ctx.SetStrokeWidth(uw)
 						ctx.SetStrokeColor(fillColor)
@@ -961,7 +950,7 @@ func (r *Renderer) renderText(ctx *canvas.Context, obj TextObject, pageH float64
 				}
 				drawGlyph(canvasX, canvasY)
 			}
-			if strings.Contains(obj.Decoration, "Underline") {
+			if hasUnderline {
 				uw := sizeMM * 0.05
 				ctx.SetStrokeWidth(uw)
 				ctx.SetStrokeColor(fillColor)
@@ -976,24 +965,6 @@ func (r *Renderer) renderText(ctx *canvas.Context, obj TextObject, pageH float64
 	ctx.Pop()
 }
 
-// hasTextMatrix 判断文本是否需要应用字形变换
-// 入参: ctm 变换矩阵
-// 返回: bool 是否需要变换
-func hasTextMatrix(ctm Matrix) bool {
-	const eps = 1e-9
-	return math.Abs(ctm.a-1) > eps || math.Abs(ctm.b) > eps || math.Abs(ctm.c) > eps || math.Abs(ctm.d-1) > eps
-}
-
-// textMatrix 获取文本字形变换矩阵
-// 入参: ctm OFD变换矩阵
-// 返回: canvas.Matrix 画布变换矩阵
-func textMatrix(ctm Matrix) canvas.Matrix {
-	return canvas.Matrix{
-		{ctm.a, -ctm.c, 0},
-		{-ctm.b, ctm.d, 0},
-	}
-}
-
 // renderStamp 渲染印章
 // 入参: ctx 画布上下文, s 印章对象, pageH 页面高度
 func (r *Renderer) renderStamp(ctx *canvas.Context, s Stamp, pageH float64) {
@@ -1239,35 +1210,3 @@ func (r *Renderer) buildTinyFillRectPath(obj PathObject, pageH float64, ctm Matr
 	p.Close()
 	return p
 }
-
-// parseIndexRunes 解析索引字形
-// 入参: indexStr 索引字符串, fontID 字体ID
-// 返回: []rune 字形列表
-func (r *Renderer) parseIndexRunes(indexStr string, fontID string) []rune {
-	var gids []int
-	parts := strings.Fields(indexStr)
-	for _, p := range parts {
-		if strings.Contains(p, "-") {
-			sub := strings.Split(p, "-")
-			if len(sub) == 2 {
-				start, _ := strconv.Atoi(sub[0])
-				end, _ := strconv.Atoi(sub[1])
-				for k := start; k <= end; k++ {
-					gids = append(gids, k)
-				}
-			}
-		} else {
-			val, _ := strconv.Atoi(p)
-			gids = append(gids, val)
-		}
-	}
-	var res []rune
-	for _, gid := range gids {
-		if rVal, ok := r.fontGlyphRune(fontID, gid); ok {
-			res = append(res, rVal)
-			continue
-		}
-		res = append(res, rune(gid))
-	}
-	return res
-}

ofdgo_text.go

@@ -15,6 +15,8 @@
 package ofdgo
 
 import (
+	"math"
+	"strconv"
 	"strings"
 
 	"github.com/tdewolff/canvas"
@@ -159,6 +161,24 @@ func textGlyphPath(face *canvas.FontFace, glyph textGlyph) (*canvas.Path, float6
 	return p, face.MmPerEm * float64(face.Font.GlyphAdvance(glyphID))
 }
 
+// hasTextMatrix 判断文本是否需要应用字形变换
+// 入参: ctm 变换矩阵
+// 返回: bool 是否需要变换
+func hasTextMatrix(ctm Matrix) bool {
+	const eps = 1e-9
+	return math.Abs(ctm.a-1) > eps || math.Abs(ctm.b) > eps || math.Abs(ctm.c) > eps || math.Abs(ctm.d-1) > eps
+}
+
+// textMatrix 获取文本字形变换矩阵
+// 入参: ctm OFD变换矩阵
+// 返回: canvas.Matrix 画布变换矩阵
+func textMatrix(ctm Matrix) canvas.Matrix {
+	return canvas.Matrix{
+		{ctm.a, -ctm.c, 0},
+		{-ctm.b, ctm.d, 0},
+	}
+}
+
 // fontGlyphRune 获取字形ID对应的包装字体字符
 // 入参: fontID 字体ID, glyphID 字形ID或CID
 // 返回: rune 包装字体字符, bool 是否存在
@@ -184,6 +204,38 @@ func (r *Renderer) fontGlyphRune(fontID string, glyphID int) (rune, bool) {
 	return 0, false
 }
 
+// parseIndexRunes 解析索引字形
+// 入参: indexStr 索引字符串, fontID 字体ID
+// 返回: []rune 字形列表
+func (r *Renderer) parseIndexRunes(indexStr string, fontID string) []rune {
+	var gids []int
+	parts := strings.Fields(indexStr)
+	for _, p := range parts {
+		if strings.Contains(p, "-") {
+			sub := strings.Split(p, "-")
+			if len(sub) == 2 {
+				start, _ := strconv.Atoi(sub[0])
+				end, _ := strconv.Atoi(sub[1])
+				for k := start; k <= end; k++ {
+					gids = append(gids, k)
+				}
+			}
+		} else {
+			val, _ := strconv.Atoi(p)
+			gids = append(gids, val)
+		}
+	}
+	var res []rune
+	for _, gid := range gids {
+		if rVal, ok := r.fontGlyphRune(fontID, gid); ok {
+			res = append(res, rVal)
+			continue
+		}
+		res = append(res, rune(gid))
+	}
+	return res
+}
+
 // textGlyphAdvanceLimit 获取显式字形推进宽度
 // 入参: dxs X方向偏移, dys Y方向偏移, xs X坐标列表, index 字形索引, count 字形数量, currentX 当前X坐标
 // 返回: float64 推进宽度
@@ -203,13 +255,13 @@ func textGlyphAdvanceLimit(dxs, dys, xs []float64, index int, count int, current
 }
 
 // textCodePositioned 判断文本编码是否带显式定位
-// 入参: textCode 文本编码
+// 入参: textCode 文本编码, xs X坐标列表, ys Y坐标列表
 // 返回: bool 是否带显式定位
-func textCodePositioned(textCode TextCode) bool {
+func textCodePositioned(textCode TextCode, xs, ys []float64) bool {
 	return strings.TrimSpace(textCode.DeltaX) != "" ||
 		strings.TrimSpace(textCode.DeltaY) != "" ||
-		len(parseFloats(textCode.X)) > 1 ||
+		len(xs) > 1 ||
-		len(parseFloats(textCode.Y)) > 1
+		len(ys) > 1
 }
 
 // textDelta 获取文本偏移量