tilde

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

Word/Math/diacritical.js

@@ -765,17 +765,18 @@ CSign.prototype.draw_breve = function(up)
 
 function CTilde()
 {
+    this.incline = 0;
     CBaseDiacritic.call(this);
 }
 extend(CTilde, CBaseDiacritic);
-CTilde.prototype.recalculateSize = function()
+CTilde.prototype.fixSize = function()
 {
     var betta = this.getTxtPrp().FontSize/36;
 
     var width = 9.047509765625*betta; // реальная на отрисовке width 7.495282031249999
     var height = 2.469444444444444*betta;
 
-    this.size = {width: width, heigth: height};
+    this.size = {width: width, height: height};
 }
 CTilde.prototype.draw = function()
 {
@@ -1001,10 +1002,15 @@ function CAccent()
     this.accent   = null;
     CMathBase.call(this);
 }
-extend(old_CAccent, CMathBase);
+extend(CAccent, CMathBase);
 CAccent.prototype.init = function(props)
 {
-    var code = props.chr.value.charCodeAt(0);
+    var code;
+
+    if(typeof(props.chr.value) === "string")
+        code = props.chr.value.charCodeAt(0);
+
+    // var code = props.chr.value.charCodeAt(0);
 
     var bDot        = code === 0x307 || props.chr.type === ACCENT_ONE_DOT,
         b2Dots      = code === 0x308 || props.chr.type === ACCENT_TWO_DOTS,
@@ -1038,6 +1044,10 @@ CAccent.prototype.init = function(props)
         this.accent = new CLine();
         this.accent.setPrp(DOUBLE_LINE);
     }
+    else if(code === 0x303 || props.chr.type === ACCENT_TILDE)
+    {
+        this.accent = new CTilde();
+    }
     else
     {
         this.accent = new CMathText();
@@ -1046,6 +1056,8 @@ CAccent.prototype.init = function(props)
         this.bDiacritic = false;
     }
 
+    var tPrp = this.getTxtPrp();
+    this.accent.setTxtPrp(tPrp);
 
     this.setDimension(1, 1);
     this.setContent();
@@ -1057,7 +1069,7 @@ CAccent.prototype.recalculateSize = function()
     this.dH = 0.7*this.getTxtPrp().FontSize/36;
 
     if(this.bDiacritic)
-        this.accent.fixSize(content.size.width, content.Incline());
+        this.accent.fixSize(content.size.width, content.IsIncline());
 
     var height = this.accent.size.height + content.size.height,
         center = this.accent.size.height + content.size.center;
@@ -1077,10 +1089,26 @@ CAccent.prototype.recalculateSize = function()
 CAccent.prototype.setPosition = function(pos)
 {
     this.pos = {x: pos.x, y: pos.y - this.size.center};
-    var pos = 
-        {
-            x: this.pos.x + (this.size.width - this.elements[0][0].size.width)/2;
-        };
 
-    this.elements[0][0].setPosition()
+    var pos =
+    {
+        x: this.pos.x + (this.size.width - this.accent.size.width)/2,
+        y: this.pos.y
+    };
+
+    this.accent.setPosition(pos);
+
+    var content = this.elements[0][0];
+    pos =
+    {
+        x: this.pos.x + (this.size.width - content.size.width)/2,
+        y: this.pos.y + this.accent.size.height
+    };
+
+    this.elements[0][0].setPosition(pos);
+}
+CAccent.prototype.draw = function()
+{
+    this.accent.draw();
+    this.elements[0][0].draw();
 }

Word/Math/mathContent.js

@@ -38,11 +38,12 @@ function mathElem(_val)
 }
 
 
+//TODO
+// доделать GroupCharacter / Delimiter в качестве cheracter может быть любой символ
 
 //TODO
 //переделать/продумать DotIndef, т.к. при перетаскивании из одного места в другое флаг DotIndef может измениться для другого контента
 
-
 //TODO
 //пересмотреть this.dW и this.dH
 
@@ -61,8 +62,7 @@ function mathElem(_val)
 
 // TODO Refactoring
 
-// 1.
-// 2. (!!) повтор IsIncline, IsHighElement
+// 1. (!!) повтор IsIncline, IsHighElement
 
 
 function CMathContent()
@@ -3961,15 +3961,7 @@ CMathContent.prototype =
                     /*var diac = this.addMComponent(15);
                     diac.init(3);
                     diac.fillPlaceholders();*/
-                    var delim = this.addMComponent(MATH_GROUP_CHARACTER);
-                    var props =
-                    {
-                        chr:            {value: "."},
-                        location:       LOCATION_TOP,
-                        justif:         VJUST_BOT
-                    };
-                    delim.init(props);
-                    delim.fillPlaceholders();
+
                     break;
                 case 153:
                     var diac = this.addMComponent(15);
@@ -4010,10 +4002,13 @@ CMathContent.prototype =
                     diac.fillPlaceholders();
                     break;
                 case 160:
-                    var diac = this.addMComponent(13);
-                    diac.init();
-                    diac.setIndex(2);
-                    diac.fillPlaceholders();
+                    var accent = this.addMComponent(MATH_ACCENT);
+                    var props =
+                    {
+                        chr:            {type:      ACCENT_TILDE}
+                    };
+                    accent.init(props);
+                    accent.fillPlaceholders();
                     break;
                 case 161:
                     var line = this.addMComponent(14);

Word/Math/mathTypes.js

@@ -96,7 +96,8 @@ var ACCENT_LINE                 =  7;
 var ACCENT_DOUBLE_LINE          =  8;
 var SINGLE_LINE                 =  9;
 var DOUBLE_LINE                 = 10;
-var MATH_TEXT                   = 11;
+var ACCENT_TILDE                = 11;
+var MATH_TEXT                   = 12;
 
 var MATRIX_CENTER               =  0;
 var MATRIX_TOP                  =  1;