修复font属性

2024-02-22 18:47:17 +08:00
parent e917dce1df
commit dbebc2805c
3 changed files with 12 additions and 8 deletions
@@ -552,7 +552,7 @@ Begin
 End;
 Function TSDocxFont.ReadPosition();virtual;
 Begin
-	return pr_.Value("Position ") / 2;
+	return pr_.Value("Position") / 2;
 End;

 Function TSDocxFont.WriteScaling(value);virtual;
@@ -620,20 +620,24 @@ End;

 Function TSDocxFont.WriteSubscript(value);virtual;
 Begin
-	pr_.VertAlign := "subscript";
+	if value then pr_.VertAlign := "subscript";
+	else if self.Subscript then pr_.VertAlign := "none";
 End;
 Function TSDocxFont.ReadSubscript();virtual;
 Begin
-	return pr_.Value("VertAlign");
+	val := pr_.Value("VertAlign");
+	return val = "subscript";
 End;

 Function TSDocxFont.WriteSuperscript(value);virtual;
 Begin
-	pr_.VertAlign := "supercript";
+	if value then pr_.VertAlign := "supercript";
+	else if self.Superscript then pr_.VertAlign := "none";
 End;
 Function TSDocxFont.ReadSuperscript();virtual;
 Begin
-	return pr_.Value("VertAlign");
+	val := pr_.Value("VertAlign");
+	return val = "supercript";
 End;

 Function TSDocxFont.WriteUnderline(value);virtual;
@@ -725,6 +729,6 @@ Begin
 End;
 Function TSDocxFont.ReadUnderlineColor();virtual;
 Begin
-	return color_[pr_.Value("UColor")];
+	return color_[pr_.Value("UColor", true)];
 End;