в формулы добавлены плейсхолдеры

функции для работы с формулами убраны из апи в контролы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53040 954022d7-b5bf-4e40-9824-e11837661b57

Word/Editor/ParagraphContent.js

@@ -7704,6 +7704,100 @@ ParaMath.prototype =
         }
     },
 	
+	AddText : function(oElem, sText, props)
+    {
+        if(sText)
+		{
+			var rPr = new CTextPr();		
+			var oMRun = new CMathRunPrp();
+			if (props)
+				oMRun.setMathRunPrp(props);
+			oMRun.setTxtPrp(rPr);
+			if (oElem)
+			{
+				oElem.addElementToContent(oMRun);		
+				for (var i=0;i<sText.length;i++)
+				{
+					/*text[i].replace("&",	"&amp;");
+					text[i].Replace("'",	"&apos;");
+					text[i].Replace("<",	"&lt;");
+					text[i].Replace(">",	"&gt;");
+					text[i].Replace("\"",	"&quot;");*/
+					oText = new CMathText();
+					oText.addTxt(sText[i]);
+					oElem.addElementToContent(oText);
+				}	
+			}
+		}
+    },
+	
+	CreateElem : function (oElem, oParent, props)
+	{
+		var ctrPrp = new CTextPr();
+		oElem.setCtrPrp(ctrPrp);
+		oElem.init(props);
+		if (oParent)
+			oParent.addElementToContent(oElem);	
+	},
+	
+	CreateFraction : function (oFraction,oParentElem,props,sNumText,sDenText)
+	{
+		this.CreateElem(oFraction, oParentElem, props);
+		
+		var oElemDen = oFraction.getDenominator();
+		this.AddText(oElemDen, sDenText);
+		
+		var oElemNum = oFraction.getNumerator();
+		this.AddText(oElemNum, sNumText);
+	},
+	
+	CreateDegree : function (oDegree, oParentElem,props,sBaseText,sSupText,sSubText)
+	{	
+		this.CreateElem(oDegree, oParentElem, props);
+		
+		var oElem = oDegree.getBase();
+		this.AddText(oElem, sBaseText);
+		
+		var oSup = oDegree.getUpperIterator();
+		this.AddText(oSup, sSupText);
+		
+		var oSub = oDegree.getLowerIterator();
+		this.AddText(oSub, sSubText);
+	},
+	
+	CreateRadical : function (oRad,oParentElem,props,sElemText,sDegText)
+	{
+		this.CreateElem(oRad, oParentElem, props);
+		
+		var oElem = oRad.getBase();
+		this.AddText(oElem, sElemText);
+		
+		var oDeg = oRad.getDegree();
+		this.AddText(oDeg, sDegText);		
+	},
+	
+	CreateNary : function (oNary,oParentElem,props,sElemText,sSubText,sSupText)
+	{
+		this.CreateElem(oNary, oParentElem, props);
+		
+		var oElem = oNary.getBase();
+		this.AddText(oElem, sElemText);
+		
+		var oSub = oNary.getLowerIterator();
+		this.AddText(oSub, sSubText);
+		
+		var oSup = oNary.getUpperIterator();
+		this.AddText(oSup, sSupText);	
+	},
+	
+	CreateBox : function (oBox,oParentElem,props,sElemText)
+	{
+		this.CreateElem(oBox, oParentElem, props);
+		
+		var oElem = oBox.getBase();
+		this.AddText(oElem, sElemText);
+	},
+
     Is_Empty : function()
     {
         return this.Math.Is_Empty();

Word/Math/accent.js

@@ -550,7 +550,7 @@ CSign.prototype.setSign = function(props)
     else
     {
         this.type = ACCENT_TEXT;
-        this.sign.add(sign.code);
+        this.sign.add(props.code);
     }
 }
 CSign.prototype.setPosition = function(pos)

Word/Math/mathContent.js

@@ -670,9 +670,6 @@ CMathContent.prototype =
             pos++;
 
         this.CurPos = pos;
-
-		//History.Add(this.Composition.CurrentContent, {Type: historyitem_Math_AddItem, Items: items, Pos: Pos, PosEnd: EndPos});
-
         return middleContent;
     },
     setComposition: function(Composition)