From c36395c0c8970e1e649246680c613d3d8464cf92 Mon Sep 17 00:00:00 2001
From: Thomas Friedel <tomee6@gmail.com>
Date: Tue, 24 Mar 2020 10:24:44 +0100
Subject: [PATCH] fixed stroke text rendering

---
 testdata/Text.png | Bin 1914 -> 1913 bytes
 text.go           |  23 +++--------------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/testdata/Text.png b/testdata/Text.png
index 4d60a2c0ce5d4d7f4e7db3ae62b3bd0c2bcfd0e2..a7a1546390d885d1532e5f10fa565ece963f806d 100755
GIT binary patch
delta 266
zcmeyx_mgje3ZuhD)d;rwU6bNmk3`OmUEI*rbSWr<<Mp0HJ2~PU3zJG2pBK$rdY}`5
z6#grgm|i@$>egS?)S0F_)5?x!?+Bi>_>7d;>TgY3fuvNl$<H{4-0o0bt2F!7uOA)>
zdH_QKb0XqQ`zy1UpGR_W39aVd5$c%KI`!3++9zVG4^6dNAN@4qT?>EM#ZWtbPciMy
z{!>rsu3k7LcK^Ct*4_fAH|$$wHKlZ8=<F1ey9U4JSy%60t)LXv^*r7rv*_Hajc?yb
pEzaV7s8qq~r-KF6vokRK{~sG19VFRv{yPH@c)I$ztaD0e0szI=ckKWG

delta 267
zcmey#_ls|W3Zvsj)d;qFEt6MQsze3Tr|vps5FZdAb#3)$tLfbjL`BrY#0&JEM{>=H
zK%h_ZPT|6D*Q~l5A2coUa8l-V<~D0p%TsF-H)iQatWMmxYU7PF-<h(a*JNEV{2dv~
zuRe_lhMFE7`LwF?Ot7@Y`JjLa5wQo>atUd#38`DIwmm|0-IdC_TE~mjYXo}N73Iy)
z2}_%=H8ncSS#x(??AG#W3eys6LrXPYC#^O+nXxPJi*5P0x^PFAH6rKtXIy$RCp7u?
qO;fk4QiohWAe@Tq?0<X=4FCVfs6_{vh|gDH00K`}KbLh*2~7aQYH~RM

diff --git a/text.go b/text.go
index 3b2fd90..5ee7362 100644
--- a/text.go
+++ b/text.go
@@ -282,25 +282,8 @@ func (cv *Canvas) StrokeText(str string, x, y float64) {
 		return
 	}
 
-	// calculate offsets
-	if cv.state.textAlign == Center {
-		x -= float64(strWidth) * 0.5
-	} else if cv.state.textAlign == Right || cv.state.textAlign == End {
-		x -= float64(strWidth)
-	}
-	metrics := cv.state.fontMetrics
-	switch cv.state.textBaseline {
-	case Alphabetic:
-	case Middle:
-		y += (-float64(metrics.Descent)/64 + float64(metrics.Height)*0.5/64)
-	case Top, Hanging:
-		y += (-float64(metrics.Descent)/64 + float64(metrics.Height)/64)
-	case Bottom, Ideographic:
-		y += -float64(metrics.Descent) / 64
-	}
-
 	scale := float64(cv.state.fontSize) / float64(baseFontSize)
-	basetf := backendbase.MatScale(backendbase.Vec{scale, scale}).Mul(cv.state.transform)
+	scaleMat := backendbase.MatScale(backendbase.Vec{scale, scale})
 
 	prev, hasPrev := truetype.Index(0), false
 	for _, rn := range str {
@@ -322,8 +305,8 @@ func (cv *Canvas) StrokeText(str string, x, y float64) {
 		}
 
 		path := cv.runePath(rn)
-		tf := backendbase.MatTranslate(backendbase.Vec{x, y}).Mul(basetf)
-		cv.strokePath(path, tf, false)
+		tf := scaleMat.Mul(backendbase.MatTranslate(backendbase.Vec{x, y})).Mul(cv.state.transform)
+		cv.strokePath(path, tf, true)
 
 		x += float64(advance) / 64
 	}