Skip to content
This repository was archived by the owner on May 21, 2022. It is now read-only.

Commit 570593e

Browse files
CSUwangjCSUwangj
committed
fix: fix GBK encode with tests
1 parent e6349bd commit 570593e

File tree

2 files changed

+97
-98
lines changed

2 files changed

+97
-98
lines changed

‎md2docx/GeneratedCode.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2068,6 +2068,5 @@ public static void GenerateFontTablePartContent(FontTablePart fontTablePart1)
20682068
fontTablePart1.Fonts = fonts1;
20692069
}
20702070

2071-
20722071
}
20732072
}

‎md2docxTests/StyleFactoryTests.cs‎

Lines changed: 97 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Xunit.Abstractions;
1+
using Xunit.Abstractions;
22
using System.Collections.Generic;
33
using Xunit;
44
using md2docx;
@@ -40,21 +40,21 @@ public class CSUStyleTestData : IEnumerable<object[]>
4040
new object[]
4141
{
4242
@"{
43-
'名称': 'heading 1',
44-
'英文字体': 'Times New Roman',
45-
'中文字体': '黑体',
46-
'字体大小': '三号',
47-
'对齐方式': '居中',
48-
'录入大纲': true,
49-
'大纲等级': 0,
50-
'加粗': false,
51-
'斜体': false,
52-
'下划线': false,
53-
'删除线': false,
54-
'首行缩进': 0,
55-
'段前分页': true,
56-
'段前后空行': 1,
57-
'行距': 0
43+
'名称': 'heading 1',
44+
'英文字体': 'Times New Roman',
45+
'中文字体': '黑体',
46+
'字体大小': '三号',
47+
'对齐方式': '居中',
48+
'录入大纲': true,
49+
'大纲等级': 0,
50+
'加粗': false,
51+
'斜体': false,
52+
'下划线': false,
53+
'删除线': false,
54+
'首行缩进': 0,
55+
'段前分页': true,
56+
'段前后空行': 1,
57+
'行距': 0
5858
}",
5959
new Style
6060
{
@@ -70,7 +70,7 @@ public class CSUStyleTestData : IEnumerable<object[]>
7070
},
7171
StyleRunProperties = new StyleRunProperties
7272
{
73-
RunFonts = new RunFonts() { Ascii = "Times New Roman", HighAnsi = "Times New Roman", EastAsia = "黑体", ComplexScript = "Times New Roman" },
73+
RunFonts = new RunFonts() { Ascii = "Times New Roman", HighAnsi = "Times New Roman", EastAsia = "黑体", ComplexScript = "Times New Roman" },
7474
FontSize = new FontSize { Val = "32" },
7575
FontSizeComplexScript = new FontSizeComplexScript { Val = "32" }
7676
}
@@ -79,21 +79,21 @@ public class CSUStyleTestData : IEnumerable<object[]>
7979
new object[]
8080
{
8181
@"{
82-
'名称': 'heading 2',
83-
'英文字体': 'Times New Roman',
84-
'中文字体': '黑体',
85-
'字体大小': '小四',
86-
'对齐方式': '左对齐',
87-
'录入大纲': true,
88-
'大纲等级': 1,
89-
'加粗': false,
90-
'斜体': false,
91-
'下划线': false,
92-
'删除线': false,
93-
'首行缩进': 2,
94-
'段前分页': false,
95-
'段前后空行': 0,
96-
'行距': 0
82+
'名称': 'heading 2',
83+
'英文字体': 'Times New Roman',
84+
'中文字体': '黑体',
85+
'字体大小': '小四',
86+
'对齐方式': '左对齐',
87+
'录入大纲': true,
88+
'大纲等级': 1,
89+
'加粗': false,
90+
'斜体': false,
91+
'下划线': false,
92+
'删除线': false,
93+
'首行缩进': 2,
94+
'段前分页': false,
95+
'段前后空行': 0,
96+
'行距': 0
9797
}",
9898
new Style
9999
{
@@ -108,7 +108,7 @@ public class CSUStyleTestData : IEnumerable<object[]>
108108
},
109109
StyleRunProperties = new StyleRunProperties
110110
{
111-
RunFonts = new RunFonts() { Ascii = "Times New Roman", HighAnsi = "Times New Roman", EastAsia = "黑体", ComplexScript = "Times New Roman" },
111+
RunFonts = new RunFonts() { Ascii = "Times New Roman", HighAnsi = "Times New Roman", EastAsia = "黑体", ComplexScript = "Times New Roman" },
112112
FontSize = new FontSize { Val = "24" },
113113
FontSizeComplexScript = new FontSizeComplexScript { Val = "24" }
114114
}
@@ -117,21 +117,21 @@ public class CSUStyleTestData : IEnumerable<object[]>
117117
new object[]
118118
{
119119
@"{
120-
'名称': 'heading 3',
121-
'英文字体': 'Times New Roman',
122-
'中文字体': '楷体',
123-
'字体大小': '小四',
124-
'对齐方式': '左对齐',
125-
'录入大纲': true,
126-
'大纲等级': 2,
127-
'加粗': false,
128-
'斜体': false,
129-
'下划线': false,
130-
'删除线': false,
131-
'首行缩进': 2,
132-
'段前分页': false,
133-
'段前后空行': 0,
134-
'行距': 0
120+
'名称': 'heading 3',
121+
'英文字体': 'Times New Roman',
122+
'中文字体': '楷体',
123+
'字体大小': '小四',
124+
'对齐方式': '左对齐',
125+
'录入大纲': true,
126+
'大纲等级': 2,
127+
'加粗': false,
128+
'斜体': false,
129+
'下划线': false,
130+
'删除线': false,
131+
'首行缩进': 2,
132+
'段前分页': false,
133+
'段前后空行': 0,
134+
'行距': 0
135135
}",
136136
new Style
137137
{
@@ -146,7 +146,7 @@ public class CSUStyleTestData : IEnumerable<object[]>
146146
},
147147
StyleRunProperties = new StyleRunProperties
148148
{
149-
RunFonts = new RunFonts() { Ascii = "Times New Roman", HighAnsi = "Times New Roman", EastAsia = "楷体", ComplexScript = "Times New Roman" },
149+
RunFonts = new RunFonts() { Ascii = "Times New Roman", HighAnsi = "Times New Roman", EastAsia = "楷体", ComplexScript = "Times New Roman" },
150150
FontSize = new FontSize { Val = "24" },
151151
FontSizeComplexScript = new FontSizeComplexScript { Val = "24" }
152152
}
@@ -155,21 +155,21 @@ public class CSUStyleTestData : IEnumerable<object[]>
155155
new object[]
156156
{
157157
@"{
158-
'名称': 'bodytext',
159-
'英文字体': 'Times New Roman',
160-
'中文字体': '宋体',
161-
'字体大小': '小四',
162-
'对齐方式': '左对齐',
163-
'录入大纲': false,
164-
'大纲等级': 0,
165-
'加粗': false,
166-
'斜体': false,
167-
'下划线': false,
168-
'删除线': false,
169-
'首行缩进': 2,
170-
'段前分页': false,
171-
'段前后空行': 0,
172-
'行距': 1.5
158+
'名称': 'bodytext',
159+
'英文字体': 'Times New Roman',
160+
'中文字体': '宋体',
161+
'字体大小': '小四',
162+
'对齐方式': '左对齐',
163+
'录入大纲': false,
164+
'大纲等级': 0,
165+
'加粗': false,
166+
'斜体': false,
167+
'下划线': false,
168+
'删除线': false,
169+
'首行缩进': 2,
170+
'段前分页': false,
171+
'段前后空行': 0,
172+
'行距': 1.5
173173
}",
174174
new Style
175175
{
@@ -184,7 +184,7 @@ public class CSUStyleTestData : IEnumerable<object[]>
184184
},
185185
StyleRunProperties = new StyleRunProperties
186186
{
187-
RunFonts = new RunFonts() { Ascii = "Times New Roman", HighAnsi = "Times New Roman", EastAsia = "宋体", ComplexScript = "Times New Roman" },
187+
RunFonts = new RunFonts() { Ascii = "Times New Roman", HighAnsi = "Times New Roman", EastAsia = "宋体", ComplexScript = "Times New Roman" },
188188
FontSize = new FontSize { Val = "24" },
189189
FontSizeComplexScript = new FontSizeComplexScript { Val = "24" }
190190
}
@@ -193,21 +193,21 @@ public class CSUStyleTestData : IEnumerable<object[]>
193193
new object[]
194194
{
195195
@"{
196-
'名称': 'code',
197-
'英文字体': 'Consolas',
198-
'中文字体': '黑体',
199-
'字体大小': '小四',
200-
'对齐方式': '左对齐',
201-
'录入大纲': false,
202-
'大纲等级': 0,
203-
'加粗': false,
204-
'斜体': false,
205-
'下划线': false,
206-
'删除线': false,
207-
'首行缩进': 0,
208-
'段前分页': false,
209-
'段前后空行': 0,
210-
'行距': 0
196+
'名称': 'code',
197+
'英文字体': 'Consolas',
198+
'中文字体': '黑体',
199+
'字体大小': '小四',
200+
'对齐方式': '左对齐',
201+
'录入大纲': false,
202+
'大纲等级': 0,
203+
'加粗': false,
204+
'斜体': false,
205+
'下划线': false,
206+
'删除线': false,
207+
'首行缩进': 0,
208+
'段前分页': false,
209+
'段前后空行': 0,
210+
'行距': 0
211211
}",
212212
new Style
213213
{
@@ -220,7 +220,7 @@ public class CSUStyleTestData : IEnumerable<object[]>
220220
},
221221
StyleRunProperties = new StyleRunProperties
222222
{
223-
RunFonts = new RunFonts() { Ascii = "Consolas", HighAnsi = "Consolas", EastAsia = "黑体", ComplexScript = "Consolas" },
223+
RunFonts = new RunFonts() { Ascii = "Consolas", HighAnsi = "Consolas", EastAsia = "黑体", ComplexScript = "Consolas" },
224224
FontSize = new FontSize { Val = "24" },
225225
FontSizeComplexScript = new FontSizeComplexScript { Val = "24" }
226226
}
@@ -229,21 +229,21 @@ public class CSUStyleTestData : IEnumerable<object[]>
229229
new object[]
230230
{
231231
@"{
232-
'名称': 'reference',
233-
'英文字体': 'Times New Roman',
234-
'中文字体': '黑体',
235-
'字体大小': '五号',
236-
'对齐方式': '左对齐',
237-
'录入大纲': false,
238-
'大纲等级': 0,
239-
'加粗': false,
240-
'斜体': false,
241-
'下划线': false,
242-
'删除线': false,
243-
'首行缩进': 0,
244-
'段前分页': false,
245-
'段前后空行': 0,
246-
'行距': 1.5
232+
'名称': 'reference',
233+
'英文字体': 'Times New Roman',
234+
'中文字体': '黑体',
235+
'字体大小': '五号',
236+
'对齐方式': '左对齐',
237+
'录入大纲': false,
238+
'大纲等级': 0,
239+
'加粗': false,
240+
'斜体': false,
241+
'下划线': false,
242+
'删除线': false,
243+
'首行缩进': 0,
244+
'段前分页': false,
245+
'段前后空行': 0,
246+
'行距': 1.5
247247
}",
248248
new Style
249249
{
@@ -257,7 +257,7 @@ public class CSUStyleTestData : IEnumerable<object[]>
257257
},
258258
StyleRunProperties = new StyleRunProperties
259259
{
260-
RunFonts = new RunFonts() { Ascii = "Times New Roman", HighAnsi = "Times New Roman", EastAsia = "黑体", ComplexScript = "Times New Roman" },
260+
RunFonts = new RunFonts() { Ascii = "Times New Roman", HighAnsi = "Times New Roman", EastAsia = "黑体", ComplexScript = "Times New Roman" },
261261
FontSize = new FontSize { Val = "21" },
262262
FontSizeComplexScript = new FontSizeComplexScript { Val = "21" }
263263
}

0 commit comments

Comments
 (0)