Merge branch 'seletskiy-master'

isgasho · Jun 18, 2019 · d4a9e3b · d4a9e3b
2 parents 9d03221 + 3170e6e
commit d4a9e3b
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/fpdf.go b/fpdf.go
@@ -2802,7 +2802,15 @@ func (f *Fpdf) WriteAligned(width, lineHeight float64, textStr, alignStr string)
 		width = pageWidth - (lMargin + rMargin)
 	}
 
-	lines := f.SplitLines([]byte(textStr), width)
+	var lines []string
+
+	if f.isCurrentUTF8 {
+		lines = f.SplitText(textStr, width)
+	} else {
+		for _, line := range f.SplitLines([]byte(textStr), width) {
+			lines = append(lines, string(line))
+		}
+	}
 
 	for _, lineBt := range lines {
 		lineStr := string(lineBt)