mirror of
https://github.com/fumiama/go-docx.git
synced 2026-06-04 23:30:25 +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:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user