Commit 6b5277cc authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

1. Math Run Prp

sty: script
2. Поправлен баг c yektdsv Run на открытии

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55632 954022d7-b5bf-4e40-9824-e11837661b57
parent 1dedc588
...@@ -7665,7 +7665,7 @@ CMathContent.prototype = ...@@ -7665,7 +7665,7 @@ CMathContent.prototype =
this.content[i].SetRunEmptyToContent(bAll); this.content[i].SetRunEmptyToContent(bAll);
} }
if(this.content[len - 1].typeObj == MATH_COMP) if(len > 0 && this.content[len - 1].typeObj == MATH_COMP)
{ {
NewContent.push( new ParaRun(this.Composition.Parent.Paragraph, true) ); NewContent.push( new ParaRun(this.Composition.Parent.Paragraph, true) );
} }
......
...@@ -189,11 +189,32 @@ CMathText.prototype = ...@@ -189,11 +189,32 @@ CMathText.prototype =
} }
else if(Type == TXT_SCRIPT) else if(Type == TXT_SCRIPT)
{ {
if(bCapitale) if(code == 0x42)
//code = code + 0x1D504; code = 0x212C;
code = code + 0x1D45C; else if(code == 0x45)
code = 0x2130;
else if(code == 0x46)
code = 0x2131;
else if(code == 0x48)
code = 0x210B;
else if(code == 0x49)
code = 0x2110;
else if(code == 0x4C)
code = 0x2112;
else if(code == 0x4D)
code = 0x2133;
else if(code == 0x52)
code = 0x211B;
else if(code == 0x65)
code = 0x212F;
else if(code == 0x67)
code = 0x210A;
else if(code == 0x6F)
code = 0x2134;
else if(bCapitale)
code = code + 0x1D45B;
else if(bSmall) else if(bSmall)
code = code + 0x1D456; code = code + 0x1D455;
} }
return code; return code;
...@@ -398,10 +419,6 @@ CMathText.prototype = ...@@ -398,10 +419,6 @@ CMathText.prototype =
else // for symbol only drawing else // for symbol only drawing
this.pos = {x: pos.x + this.GapLeft, y: pos.y + this.size.ascent}; this.pos = {x: pos.x + this.GapLeft, y: pos.y + this.size.ascent};
}, },
new_setPosition: function(pos)
{
this.pos = {x: pos.x , y: pos.y};
},
setCoeffTransform: function(sx, shx, shy, sy) setCoeffTransform: function(sx, shx, shy, sy)
{ {
this.transform = {sx: sx, shx: shx, shy: shy, sy: sy}; this.transform = {sx: sx, shx: shx, shy: shy, sy: sy};
......
...@@ -90,10 +90,10 @@ var ACCENT_HALF_ARROW_RIGHT = 30; ...@@ -90,10 +90,10 @@ var ACCENT_HALF_ARROW_RIGHT = 30;
var TXT_NORMAL = 0; var TXT_NORMAL = 0;
var TXT_ROMAN = 1; // math roman var TXT_ROMAN = 1; // math roman
var TXT_SCRIPT = 2; var TXT_SCRIPT = 2;
var TXT_FRAKTUR = 2; var TXT_FRAKTUR = 3;
var TXT_DOUBLE_STRUCK = 3; var TXT_DOUBLE_STRUCK = 4;
var TXT_SANS_SERIF = 4; var TXT_SANS_SERIF = 5;
var TXT_MONOSPACE = 5; var TXT_MONOSPACE = 6;
/*var SCR_ROMAN = 0; /*var SCR_ROMAN = 0;
var SCR_SCRIPT = 1; var SCR_SCRIPT = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment