Merge branch 'development' of https://github.com/unidoc/unipdf into c…

…olumns
unidoc · gunnsth · Jun 30, 2020 · May 19, 2020 · May 19, 2020 · May 20, 2020
commit b39f205815050c4e162b9d7be1cbfa090de53e9a
diff --git a/extractor/text.go b/extractor/text.go
@@ -847,12 +847,15 @@ func (to *textObject) renderText(data []byte) error {
 			translation(end),
 			math.Abs(spaceWidth*trm.ScalingFactorX()),
 			font,
-			to.state.tc)
+			to.state.tc,
+			fillColor,
+			strokeColor)
+
 		if !onPage {
 			common.Log.Debug("Text mark outside page. Skipping")
 			continue
 		}
-		if font == nil {
+if font == nil {
 			common.Log.Debug("ERROR: No font.")
 		} else if font.Encoder() == nil {
 			common.Log.Debug("ERROR: No encoding. font=%s", font)
@@ -896,6 +899,14 @@ func (to *textObject) moveTo(tx, ty float64) {
 	to.tm = to.tlm
 }
 
+
+
+
+
+
+
+
+
 // PageText represents the layout of text on a device page.
 type PageText struct {
 	marks      []*textMark        // Texts and their positions on a PDF page.

diff --git a/extractor/text_mark.go b/extractor/text_mark.go
@@ -7,6 +7,7 @@ package extractor
 
 import (
 	"fmt"
+	"image/color"
 	"math"
 
 	"github.com/unidoc/unipdf/v3/common"
@@ -27,13 +28,16 @@ type textMark struct {
 	trm                transform.Matrix   // The current text rendering matrix (TRM above).
 	end                transform.Point    // The end of character device coordinates.
 	originaBBox        model.PdfRectangle // Bounding box without orientation correction.
+	fillColor          color.Color        // Text fill color.
+	strokeColor        color.Color        // Text stroke color.
 }
 
 // newTextMark returns a textMark for text `text` rendered with text rendering matrix (TRM) `trm`
 // and end of character device coordinates `end`. `spaceWidth` is our best guess at the width of a
 // space in the font the text is rendered in device coordinates.
 func (to *textObject) newTextMark(text string, trm transform.Matrix, end transform.Point,
-	spaceWidth float64, font *model.PdfFont, charspacing float64) (textMark, bool) {
+	spaceWidth float64, font *model.PdfFont, charspacing float64,
+	fillColor, strokeColor color.Color) (textMark, bool) {
 	theta := trm.Angle()
 	orient := nearestMultiple(theta, orientationGranularity)
 	var height float64
@@ -117,6 +121,8 @@ func (to *textObject) newTextMark(text string, trm transform.Matrix, end transfo
 		trm:          trm,
 		end:          end,
 		orient:       orient,
+		fillColor:    fillColor,
+		strokeColor:  strokeColor,
 	}
 	if verboseGeom {
 		common.Log.Info("newTextMark: start=%.2f end=%.2f %s", start, end, tm.String())