From 60847b0636b7594643b3444c2758d957e5b13af1 Mon Sep 17 00:00:00 2001
From: csh <caoshenghui@tinysoft.com.cn>
Date: Fri, 25 Aug 2023 10:54:54 +0800
Subject: [PATCH] v1.4.3-patch1

---
 funcext/TSOffice/TOfficeObj.tsf       | 6 ++++--
 funcext/TSOffice/TSUtils/NodeInfo.tsf | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/funcext/TSOffice/TOfficeObj.tsf b/funcext/TSOffice/TOfficeObj.tsf
index 2e08770..60a18f7 100644
--- a/funcext/TSOffice/TOfficeObj.tsf
+++ b/funcext/TSOffice/TOfficeObj.tsf
@@ -6117,10 +6117,11 @@ type TwpPr=class(NodeInfo)
 			,("field":"OutlineLevel","name":"w:outlineLvl","obj":OutlineLevel,"attrEx":"w:val","nodeType":"","attrName":"", "desc":"设置当前文档中第一段的大纲级别", "class":"")
 			,("field":"KeepTogether","name":"w:keepLines","obj":KeepTogether,"attrEx":"w:val","nodeType":"","attrName":"", "desc":"段落是否应保持完整且不应跨越页面边界", "class":"")
 			,("field":"KeepWithNext","name":"w:keepNext","obj":KeepWithNext,"attrEx":"w:val","nodeType":"","attrName":"", "desc":"该段是否应与下一段保持在同一页上", "class":"")
-			,("field":"PageBreakBefore","name":"w:pageBreakBefore","obj":PageBreakBefore,"attrEx":"","nodeType":"empty","attrName":"", "desc":"该段该段出现在前一段之后的页面顶部", "class":"")
+			,("field":"PageBreakBefore","name":"w:pageBreakBefore","obj":PageBreakBefore,"attrEx":"w:val","nodeType":"empty","attrName":"", "desc":"该段该段出现在前一段之后的页面顶部", "class":"")
 			,("field":"WidowControl","name":"w:widowControl","obj":WidowControl,"attrEx":"w:val","nodeType":"","attrName":"", "desc":"当Word对文档重新分页时，如果段落中的第一行和最后一行与段落的其余部分保持在同一页上", "class":"")
 			,("field":"TextAlignment","name":"w:textAlignment","obj":TextAlignment,"attrEx":"","nodeType":"empty","attrName":"", "desc":"该值指示文本内容的水平对齐方式", "class":"")
-			,("field":"AdjustRightInd","name":"w:adjustRightInd","obj":AdjustRightInd,"attrEx":"","nodeType":"empty","attrName":"", "desc":"使用文档网格时自动调整右缩进", "class":"")
+			,("field":"AdjustRightInd","name":"w:adjustRightInd","obj":AdjustRightInd,"attrEx":"w:val","nodeType":"empty","attrName":"", "desc":"使用文档网格时自动调整右缩进", "class":"")
+			,("field":"SnapToGrid","name":"w:snapToGrid","obj":SnapToGrid,"attrEx":"w:val","nodeType":"empty","attrName":"", "desc":"如果定义了文档网络，则对齐到网格", "class":"")
 			,("field":"AutoSpaceDE","name":"w:autoSpaceDE","obj":AutoSpaceDE,"attrEx":"","nodeType":"empty","attrName":"", "desc":"自动调整拉丁语和东亚文本的间距", "class":"")
 			,("field":"AutoSpaceDN","name":"w:autoSpaceDN","obj":AutoSpaceDN,"attrEx":"","nodeType":"empty","attrName":"", "desc":"自动调整东亚文本和数字的间距", "class":"")
 			,("field":"Tabs","name":Tabs.NodeName,"obj":Tabs,"attrEx":"","nodeType":"","attrName":"", "desc":"disable", "class":"TTabStops")
@@ -6160,6 +6161,7 @@ type TwpPr=class(NodeInfo)
 	WidowControl;
 	TextAlignment;
 	AdjustRightInd;
+	SnapToGrid;
 	AutoSpaceDE;
 	AutoSpaceDN;
 	Tabs;
diff --git a/funcext/TSOffice/TSUtils/NodeInfo.tsf b/funcext/TSOffice/TSUtils/NodeInfo.tsf
index 5febe3c..964fc29 100644
--- a/funcext/TSOffice/TSUtils/NodeInfo.tsf
+++ b/funcext/TSOffice/TSUtils/NodeInfo.tsf
@@ -98,8 +98,9 @@ public
 			arr := array('type': 'element', 'name': children_[i]['name'], 'attributes': array());
 			if node_type = 'empty' then  // <b/>
 			begin
-				if obj = 0 then arr['attributes'] := array('val': 0);
-				else if obj = 1 then arr['attributes'] := array('val': 1)
+				empty_name := children_[i]['attrEx'] ? children_[i]['attrEx'] : 'val';
+				if obj = 0 then arr['attributes'] := array(empty_name: 0);
+				else if obj = 1 then arr['attributes'] := array(empty_name: 1)
 			end
 			else if node_type = 'pcdata' then
 			begin