summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt <kurt.w.jung@gmail.com>2017-11-24 10:42:13 -0500
committerKurt <kurt.w.jung@gmail.com>2017-11-24 10:42:13 -0500
commita3f28ba717a677e133f159e3fc1d42b249c2b511 (patch)
tree9e5ff9c0ff5ec004607b24b24b54e1a882e5b524
parent8251b8def6a5b73f826587308bcba926a17b6ea9 (diff)
parentc6b082a6263bbfcfab0dcc4f4c4bb2c024c84f10 (diff)
Merge branch 'wgliang-master'
-rw-r--r--fpdf.go10
-rw-r--r--template.go4
2 files changed, 6 insertions, 8 deletions
diff --git a/fpdf.go b/fpdf.go
index a590581..1503a4e 100644
--- a/fpdf.go
+++ b/fpdf.go
@@ -1931,19 +1931,19 @@ func (f *Fpdf) CellFormat(w, h float64, txtStr string, borderStr string, ln int,
if len(txtStr) > 0 {
var dx, dy float64
// Horizontal alignment
- if strings.Index(alignStr, "R") != -1 {
+ if strings.Contains(alignStr, "R") {
dx = w - f.cMargin - f.GetStringWidth(txtStr)
- } else if strings.Index(alignStr, "C") != -1 {
+ } else if strings.Contains(alignStr, "C") {
dx = (w - f.GetStringWidth(txtStr)) / 2
} else {
dx = f.cMargin
}
// Vertical alignment
- if strings.Index(alignStr, "T") != -1 {
+ if strings.Contains(alignStr, "T") {
dy = (f.fontSize - h) / 2.0
- } else if strings.Index(alignStr, "B") != -1 {
+ } else if strings.Contains(alignStr, "B") {
dy = (h - f.fontSize) / 2.0
- } else if strings.Index(alignStr, "A") != -1 {
+ } else if strings.Contains(alignStr, "A") {
var descent float64
d := f.currentFont.Desc
if d.Descent == 0 {
diff --git a/template.go b/template.go
index 1826fd7..60b076b 100644
--- a/template.go
+++ b/template.go
@@ -254,9 +254,7 @@ func templateChainDependencies(template Template) []Template {
requires := template.Templates()
chain := make([]Template, len(requires)*2)
for _, req := range requires {
- for _, sub := range templateChainDependencies(req) {
- chain = append(chain, sub)
- }
+ chain = append(chain, templateChainDependencies(req)...)
}
chain = append(chain, template)
return chain