Initial import of new freetype font handling.

cmd/testdraw2d.go

@@ -488,12 +488,13 @@ func TestFillString() {
 	i, gc := initGc(100, 100)
 	draw2d.RoundRect(gc, 5, 5, 95, 95, 10, 10)
 	gc.FillStroke()
+	gc.SetFillColor(image.Black)
 	gc.SetFontSize(18)
-	gc.MoveTo(10, 52)
+	gc.Translate(6, 52)
 	gc.SetFontData(draw2d.FontData{"luxi", draw2d.FontFamilyMono, draw2d.FontStyleBold | draw2d.FontStyleItalic})
 	width := gc.FillString("cou")
-	gc.RMoveTo(width+1, 0)
+	gc.Translate(width+1, 0)
-	gc.FillString("cou")
+	gc.StrokeString("cou")
 	saveToPngFile("TestFillString", i)
 }
 

draw2d/font.go

@@ -4,7 +4,6 @@
 package draw2d
 
 import (
-	"code.google.com/p/freetype-go/freetype"
 	"code.google.com/p/freetype-go/freetype/truetype"
 	"io/ioutil"
 	"log"
@@ -89,7 +88,7 @@ func loadFont(fontFileName string) *truetype.Font {
 		log.Println(err)
 		return nil
 	}
-	font, err := freetype.ParseFont(fontBytes)
+	font, err := truetype.Parse(fontBytes)
 	if err != nil {
 		log.Println(err)
 		return nil

draw2d/gc.go

@@ -44,6 +44,7 @@ type GraphicContext interface {
 	SetDPI(dpi int)
 	GetDPI() int
 	FillString(text string) (cursor float64)
+	StrokeString(text string) (cursor float64)
 	Stroke(paths ...*PathStorage)
 	Fill(paths ...*PathStorage)
 	FillStroke(paths ...*PathStorage)

draw2d/image.go

@@ -4,8 +4,9 @@
 package draw2d
 
 import (
-	"code.google.com/p/freetype-go/freetype"
 	"code.google.com/p/freetype-go/freetype/raster"
+	"code.google.com/p/freetype-go/freetype/truetype"
+	"errors"
 	"image"
 	"image/color"
 	"image/draw"
@@ -27,7 +28,7 @@ type ImageGraphicContext struct {
 	painter          Painter
 	fillRasterizer   *raster.Rasterizer
 	strokeRasterizer *raster.Rasterizer
-	freetype         *freetype.Context
+	glyphBuf         *truetype.GlyphBuf
 	DPI              int
 }
 
@@ -42,49 +43,25 @@ func NewGraphicContext(img draw.Image) *ImageGraphicContext {
 	default:
 		panic("Image type not supported")
 	}
-	width, height := img.Bounds().Dx(), img.Bounds().Dy()
+	return NewGraphicContextWithPainter(img, painter)
-	dpi := 92
-	ftContext := freetype.NewContext()
-	ftContext.SetDPI(float64(dpi))
-	ftContext.SetClip(img.Bounds())
-	ftContext.SetDst(img)
-	gc := &ImageGraphicContext{
-		NewStackGraphicContext(),
-		img,
-		painter,
-		raster.NewRasterizer(width, height),
-		raster.NewRasterizer(width, height),
-		ftContext,
-		dpi,
-	}
-	return gc
 }
 
 // Create a new Graphic context from an image and a Painter (see Freetype-go)
 func NewGraphicContextWithPainter(img draw.Image, painter Painter) *ImageGraphicContext {
 	width, height := img.Bounds().Dx(), img.Bounds().Dy()
 	dpi := 92
-	ftContext := freetype.NewContext()
-	ftContext.SetDPI(float64(dpi))
-	ftContext.SetClip(img.Bounds())
-	ftContext.SetDst(img)
 	gc := &ImageGraphicContext{
 		NewStackGraphicContext(),
 		img,
 		painter,
 		raster.NewRasterizer(width, height),
 		raster.NewRasterizer(width, height),
-		ftContext,
+		truetype.NewGlyphBuf(),
 		dpi,
 	}
 	return gc
 }
 
-func (gc *ImageGraphicContext) SetDPI(dpi int) {
-	gc.DPI = dpi
-	gc.freetype.SetDPI(float64(dpi))
-}
-
 func (gc *ImageGraphicContext) GetDPI() int {
 	return gc.DPI
 }
@@ -104,12 +81,32 @@ func (gc *ImageGraphicContext) DrawImage(img image.Image) {
 }
 
 func (gc *ImageGraphicContext) FillString(text string) (cursor float64) {
-	gc.freetype.SetSrc(image.NewUniform(gc.Current.StrokeColor))
+	return gc.FillStringAt(text, 0, 0)
-	// Draw the text.
+}
-	x, y := gc.Current.Path.LastPoint()
+
-	gc.Current.Tr.Transform(&x, &y)
+func (gc *ImageGraphicContext) FillStringAt(text string, x, y float64) (cursor float64) {
-	x0, fontSize := 0.0, gc.Current.FontSize
+	width := gc.CreateStringPath(text, x, y)
-	gc.Current.Tr.VectorTransform(&x0, &fontSize)
+	gc.Fill()
+	return width
+}
+
+func (gc *ImageGraphicContext) StrokeString(text string) (cursor float64) {
+	return gc.StrokeStringAt(text, 0, 0)
+}
+
+func (gc *ImageGraphicContext) StrokeStringAt(text string, x, y float64) (cursor float64) {
+	width := gc.CreateStringPath(text, x, y)
+	gc.Stroke()
+	return width
+}
+
+// CreateStringPath creates a path from the string s at x, y, and returns the string width.
+// The text is placed so that the left edge of the em square of the first character of s
+// and the baseline intersect at x, y. The majority of the affected pixels will be
+// above and to the right of the point, but some may be below or to the left.
+// For example, drawing a string that starts with a 'J' in an italic font may
+// affect pixels below and left of the point.
+func (gc *ImageGraphicContext) CreateStringPath(text string, x, y float64) (width float64) {
 	font := GetFont(gc.Current.FontData)
 	if font == nil {
 		font = GetFont(defaultFontData)
@@ -117,20 +114,120 @@ func (gc *ImageGraphicContext) FillString(text string) (cursor float64) {
 	if font == nil {
 		return 0
 	}
-	gc.freetype.SetFont(font)
+	gc.SetFont(font)
-	gc.freetype.SetFontSize(fontSize)
+	gc.SetFontSize(gc.Current.FontSize)
-	pt := freetype.Pt(int(x), int(y))
+	width, err := gc._createStringPath(text, 0, 0)
-	p, err := gc.freetype.DrawString(text, pt)
 	if err != nil {
 		log.Println(err)
 	}
-	x1, _ := gc.Current.Path.LastPoint()
-	x2, y2 := float64(p.X)/256, float64(p.Y)/256
-	gc.Current.Tr.InverseTransform(&x2, &y2)
-	width := x2 - x1
 	return width
 }
 
+func fUnitsToFloat64(x int32) float64 {
+	scaled := x << 2
+	return float64(scaled/256) + float64(scaled%256)/256.0
+}
+
+// p is a truetype.Point measured in FUnits and positive Y going upwards.
+// The returned value is the same thing measured in floating point and positive Y
+// going downwards.
+func pointToF64Point(p truetype.Point) (x, y float64) {
+	return fUnitsToFloat64(p.X), -fUnitsToFloat64(p.Y)
+}
+
+// drawContour draws the given closed contour at the given sub-pixel offset.
+func (gc *ImageGraphicContext) drawContour(ps []truetype.Point, dx, dy float64) {
+	if len(ps) == 0 {
+		return
+	}
+	startX, startY := pointToF64Point(ps[0])
+	gc.MoveTo(startX+dx, startY+dy)
+	q0X, q0Y, on0 := startX, startY, true
+	for _, p := range ps[1:] {
+		qX, qY := pointToF64Point(p)
+		on := p.Flags&0x01 != 0
+		if on {
+			if on0 {
+				gc.LineTo(qX+dx, qY+dy)
+			} else {
+				gc.QuadCurveTo(q0X+dx, q0Y+dy, qX+dx, qY+dy)
+			}
+		} else {
+			if on0 {
+				// No-op.
+			} else {
+				midX := (q0X + qX) / 2
+				midY := (q0Y + qY) / 2
+				gc.QuadCurveTo(q0X+dx, q0Y+dy, midX+dx, midY+dy)
+			}
+		}
+		q0X, q0Y, on0 = qX, qY, on
+	}
+	// Close the curve.
+	if on0 {
+		gc.LineTo(startX+dx, startY+dy)
+	} else {
+		gc.QuadCurveTo(q0X+dx, q0Y+dy, startX+dx, startY+dy)
+	}
+}
+
+func (gc *ImageGraphicContext) drawGlyph(glyph truetype.Index, dx, dy float64) error {
+	if err := gc.glyphBuf.Load(gc.Current.font, gc.Current.scale, glyph, nil); err != nil {
+		return err
+	}
+	e0 := 0
+	for _, e1 := range gc.glyphBuf.End {
+		gc.drawContour(gc.glyphBuf.Point[e0:e1], dx, dy)
+		e0 = e1
+	}
+	return nil
+}
+
+func (gc *ImageGraphicContext) _createStringPath(s string, x, y float64) (float64, error) {
+	font := gc.Current.font
+	if font == nil {
+		return 0.0, errors.New("draw2d: CreateStringPath called with a nil font")
+	}
+	startx := x
+	prev, hasPrev := truetype.Index(0), false
+	for _, rune := range s {
+		index := font.Index(rune)
+		if hasPrev {
+			x += fUnitsToFloat64(font.Kerning(gc.Current.scale, prev, index))
+		}
+		err := gc.drawGlyph(index, x, y)
+		if err != nil {
+			return startx - x, err
+		}
+		x += fUnitsToFloat64(font.HMetric(gc.Current.scale, index).AdvanceWidth)
+		prev, hasPrev = index, true
+	}
+	return x - startx, nil
+}
+
+// recalc recalculates scale and bounds values from the font size, screen
+// resolution and font metrics, and invalidates the glyph cache.
+func (gc *ImageGraphicContext) recalc() {
+	gc.Current.scale = int32(gc.Current.FontSize * float64(gc.DPI) * (64.0 / 72.0))
+}
+
+// SetDPI sets the screen resolution in dots per inch.
+func (gc *ImageGraphicContext) SetDPI(dpi int) {
+	gc.DPI = dpi
+	gc.recalc()
+}
+
+// SetFont sets the font used to draw text.
+func (gc *ImageGraphicContext) SetFont(font *truetype.Font) {
+	gc.Current.font = font
+}
+
+// SetFontSize sets the font size in points (as in ``a 12 point font'').
+func (gc *ImageGraphicContext) SetFontSize(fontSize float64) {
+	gc.Current.FontSize = fontSize
+	gc.recalc()
+}
+
 func (gc *ImageGraphicContext) paint(rasterizer *raster.Rasterizer, color color.Color) {
 	gc.painter.SetColor(color)
 	rasterizer.Rasterize(gc.painter)

draw2d/stack_gc.go

@@ -4,6 +4,7 @@
 package draw2d
 
 import (
+	"code.google.com/p/freetype-go/freetype/truetype"
 	"image"
 	"image/color"
 )
@@ -25,6 +26,12 @@ type ContextStack struct {
 	Join        Join
 	FontSize    float64
 	FontData    FontData
+
+	font *truetype.Font
+	// fontSize and dpi are used to calculate scale. scale is the number of
+	// 26.6 fixed point units in 1 em.
+	scale int32
+
 	previous *ContextStack
 }
 
@@ -185,6 +192,8 @@ func (gc *StackGraphicContext) Save() {
 	context.Cap = gc.Current.Cap
 	context.Join = gc.Current.Join
 	context.Path = gc.Current.Path.Copy()
+	context.font = gc.Current.font
+	context.scale = gc.Current.scale
 	copy(context.Tr[:], gc.Current.Tr[:])
 	context.previous = gc.Current
 	gc.Current = context