field NUMPAGES

word/Editor/Field.js

@@ -38,6 +38,7 @@ var History = AscCommon.History;
 var fieldtype_UNKNOWN    = 0x0000;
 var fieldtype_MERGEFIELD = 0x0001;
 var fieldtype_PAGENUM    = 0x0002;
+var fieldtype_PAGECOUNT  = 0x0003;
 
 /**
  *

word/Editor/Serialize2.js

@@ -4332,7 +4332,7 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
         var aRunRanges = [];
         for (var i = ParaStart; i < ParaEnd && i < oRun.Content.length; i++) {
             var item = oRun.Content[i];
-            if (item.Type == para_PageNum) {
+            if (item.Type == para_PageNum || item.Type == para_PageCount) {
                 var elem;
                 if (nPrevIndex < i)
                     elem = { nStart: nPrevIndex, nEnd: i, pageNum: item };
@@ -4358,7 +4358,12 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
                 });
             }
             if (null != elem.pageNum) {
-				var Instr = "PAGE \\* MERGEFORMAT";
+				var Instr;
+				if (elem.pageNum.Type == para_PageNum) {
+					Instr = "PAGE \\* MERGEFORMAT";
+				} else {
+					Instr = "NUMPAGES \\* MERGEFORMAT";
+				}
 				this.bs.WriteItem(c_oSerParType.FldSimple, function(){oThis.WriteFldSimple(Instr, function(){
                     oThis.WriteRun2(function () {
                         //всегда что-то пишем, потому что если ничего нет в w:t, то и не применяются настройки
@@ -9179,6 +9184,9 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, curFoo
 		else if("PAGE" == sFieldType){
             oRes = new ParaField(fieldtype_PAGENUM, aArguments, aSwitches);
 		}
+		else if("NUMPAGES" == sFieldType){
+			oRes = new ParaField(fieldtype_PAGECOUNT, aArguments, aSwitches);
+		}
 		else if("MERGEFIELD" == sFieldType){
 			oRes = new ParaField(fieldtype_MERGEFIELD, aArguments, aSwitches);
             if (editor)
@@ -13277,13 +13285,17 @@ OpenParStruct.prototype = {
             this.cur = this.stack[this.stack.length - 1];
             var elem = oPrevElem.elem;
             if (null != elem && elem.Content) {
-                if (para_Field == elem.Get_Type() && fieldtype_PAGENUM == elem.Get_FieldType()) {
+                if (para_Field == elem.Get_Type() && (fieldtype_PAGENUM == elem.Get_FieldType() || fieldtype_PAGECOUNT == elem.Get_FieldType())) {
                     var oNewRun = new ParaRun(this.paragraph);
                     var rPr = getStyleFirstRun(elem);
                     if (rPr) {
                         oNewRun.Set_Pr(rPr);
                     }
-                    oNewRun.Add_ToContent(0, new ParaPageNum());
+					if (fieldtype_PAGENUM == elem.Get_FieldType()) {
+						oNewRun.Add_ToContent(0, new ParaPageNum());
+					} else {
+						oNewRun.Add_ToContent(0, new ParaPageCount());
+					}
                     this.addToContent(oNewRun);
                 } else if(elem.Content.length > 0) {
                     this.addToContent(elem);