diff --git a/apirun.go b/apirun.go index e5d5128..c87f10a 100644 --- a/apirun.go +++ b/apirun.go @@ -100,11 +100,12 @@ func (r *Run) AddTab() *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{ - ASCII: ascii, - HAnsi: hansi, - Hint: hint, + ASCII: ascii, + EastAsia: eastAsia, + HAnsi: hansi, + Hint: hint, } return r } diff --git a/cmd/main/main.go b/cmd/main/main.go index 103cfaa..ea83c3d 100644 --- a/cmd/main/main.go +++ b/cmd/main/main.go @@ -66,11 +66,12 @@ func main() { para1.AddText("italic").Italic().AddTab() para1.AddText("underline").Underline("double").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.AddText("test all font attrs"). - Size("44").Color("ff0000").Font("Consolas", "", "cs"). + Size("44").Color("ff0000"). + Font("Consolas", "", "", "cs"). Shade("clear", "auto", "E7E6E6"). Bold().Italic().Underline("wave"). Highlight("yellow") diff --git a/structdrawing_test.go b/structdrawing_test.go index 0744e63..4d4e403 100644 --- a/structdrawing_test.go +++ b/structdrawing_test.go @@ -37,7 +37,7 @@ func TestDrawingStructure(t *testing.T) { Shade("clear", "auto", "E7E6E6"). AddTab().Bold().Underline("single"). Highlight("yellow").Italic(). - Font("宋体", "宋体", "eastAsia") + Font("宋体", "宋体", "宋体", "eastAsia") r, err := para1.AddAnchorDrawingFrom("testdata/fumiama.JPG") if err != nil { t.Fatal(err)