1
0
mirror of https://github.com/fumiama/go-docx.git synced 2026-06-21 19:13:37 +08:00

fix: 修复Font设置 (#45)

* fix: 修复Font设置

* Update main.go

* fix: 修复测试函数

---------

Co-authored-by: guoqiang <guoqiang@antiy.cn>
Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>
This commit is contained in:
Rodrigo Stewart
2024-12-23 23:23:52 +08:00
committed by GitHub
parent f7d29bb5c3
commit 7d167974e5
3 changed files with 9 additions and 7 deletions

View File

@@ -100,11 +100,12 @@ func (r *Run) AddTab() *Run {
} }
// Font sets the font of the run // Font sets the font of the run
func (r *Run) Font(ascii, hansi, hint string) *Run { func (r *Run) Font(ascii, eastAsia, hansi, hint string) *Run {
r.RunProperties.Fonts = &RunFonts{ r.RunProperties.Fonts = &RunFonts{
ASCII: ascii, ASCII: ascii,
HAnsi: hansi, EastAsia: eastAsia,
Hint: hint, HAnsi: hansi,
Hint: hint,
} }
return r return r
} }

View File

@@ -66,11 +66,12 @@ func main() {
para1.AddText("italic").Italic().AddTab() para1.AddText("italic").Italic().AddTab()
para1.AddText("underline").Underline("double").AddTab() para1.AddText("underline").Underline("double").AddTab()
para1.AddText("highlight").Highlight("yellow").AddTab() para1.AddText("highlight").Highlight("yellow").AddTab()
para1.AddText("font").Font("Consolas", "", "cs").AddTab() para1.AddText("font").Font("Consolas", "", "", "cs").AddTab()
para2 := w.AddParagraph().Justification("end") para2 := w.AddParagraph().Justification("end")
para2.AddText("test all font attrs"). para2.AddText("test all font attrs").
Size("44").Color("ff0000").Font("Consolas", "", "cs"). Size("44").Color("ff0000").
Font("Consolas", "", "", "cs").
Shade("clear", "auto", "E7E6E6"). Shade("clear", "auto", "E7E6E6").
Bold().Italic().Underline("wave"). Bold().Italic().Underline("wave").
Highlight("yellow") Highlight("yellow")

View File

@@ -37,7 +37,7 @@ func TestDrawingStructure(t *testing.T) {
Shade("clear", "auto", "E7E6E6"). Shade("clear", "auto", "E7E6E6").
AddTab().Bold().Underline("single"). AddTab().Bold().Underline("single").
Highlight("yellow").Italic(). Highlight("yellow").Italic().
Font("宋体", "宋体", "eastAsia") Font("宋体", "宋体", "宋体", "eastAsia")
r, err := para1.AddAnchorDrawingFrom("testdata/fumiama.JPG") r, err := para1.AddAnchorDrawingFrom("testdata/fumiama.JPG")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)