OrgGo/unipdf
1
0
Fork 0
mirror of https://github.com/unidoc/unipdf.git synced 2025-04-30 13:48:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove right trailing space on paragraph text wrap

Browse Source
This commit is contained in:
Adrian-George Bostan 2018-09-24 17:34:45 +03:00
parent f78e7d6633
commit c4f0bdb402
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pdf/creator/styled_paragraph.go
View File

@ -8,6 +8,8 @@ package creator
import ( import (
"errors" "errors"
"fmt" "fmt"
"strings"
"unicode"
"github.com/unidoc/unidoc/common" "github.com/unidoc/unidoc/common"
"github.com/unidoc/unidoc/pdf/contentstream" "github.com/unidoc/unidoc/pdf/contentstream"
@ -261,7 +263,10 @@ func (p *StyledParagraph) wrapText() error {
// newline wrapping. // newline wrapping.
if glyph == "controllf" { if glyph == "controllf" {
// moves to next line. // moves to next line.
line = append(line, TextChunk{Text: string(part), Style: style}) line = append(line, TextChunk{
Text: strings.TrimRightFunc(string(part), unicode.IsSpace),
Style: style,
})
p.lines = append(p.lines, line) p.lines = append(p.lines, line)
line = []TextChunk{} line = []TextChunk{}
@ -295,7 +300,7 @@ func (p *StyledParagraph) wrapText() error {
} }
text := string(part) text := string(part)
if idx > 0 { if idx >= 0 {
text = string(part[0 : idx+1]) text = string(part[0 : idx+1])
part = part[idx+1:] part = part[idx+1:]
@ -316,7 +321,10 @@ func (p *StyledParagraph) wrapText() error {
widths = []float64{w} widths = []float64{w}
} }
line = append(line, TextChunk{Text: string(text), Style: style}) line = append(line, TextChunk{
Text: strings.TrimRightFunc(string(text), unicode.IsSpace),
Style: style,
})
p.lines = append(p.lines, line) p.lines = append(p.lines, line)
line = []TextChunk{} line = []TextChunk{}
} else { } else {
@ -328,7 +336,10 @@ func (p *StyledParagraph) wrapText() error {
} }
if len(part) > 0 { if len(part) > 0 {
line = append(line, TextChunk{Text: string(part), Style: style}) line = append(line, TextChunk{
Text: string(part),
Style: style,
})
} }
} }
@ -517,12 +528,10 @@ func drawStyledParagraphOnBlock(blk *Block, p *StyledParagraph, ctx DrawContext)
} }
} else if p.alignment == TextAlignmentCenter { } else if p.alignment == TextAlignmentCenter {
// Start with a shift. // Start with a shift.
textWidth := width + spaceWidth shift := (p.wrapWidth*1000.0 - width - spaceWidth) / 2 / defaultFontSize
shift := (p.wrapWidth*1000.0 - textWidth) / 2 / defaultFontSize
objs = append(objs, core.MakeFloat(-shift)) objs = append(objs, core.MakeFloat(-shift))
} else if p.alignment == TextAlignmentRight { } else if p.alignment == TextAlignmentRight {
textWidth := width + spaceWidth shift := (p.wrapWidth*1000.0 - width - spaceWidth) / defaultFontSize
shift := (p.wrapWidth*1000.0 - textWidth) / defaultFontSize
objs = append(objs, core.MakeFloat(-shift)) objs = append(objs, core.MakeFloat(-shift))
} }