Skip to content

S
sdkjs
Commit a428bd91 authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov
Browse files
Options

1. Поправила баг : не учитывались gaps для букв после последних правок 

2. Поправила баг  для EqArray в случае с одним Run в контенте : если в столбце выравнивания максимальный по ширине элемент не имеет нечетную точку выравнивания, то элементы с нечетными точками выравниваются по середине относительно его, а относительно друг друга как обычно (выравнивание справо для левой части, выравнивание слево для правой части)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57874 954022d7-b5bf-4e40-9824-e11837661b57
parent e8720566
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 92 deletions
Word/Editor/Run.js
View file @ a428bd91
......@@ -4377,6 +4377,10 @@ ParaRun.prototype =
if ( true === CheckEnd )
return ( EndPos > StartPos ? false : true );
else if(this.Type == para_Math_Run && this.Is_Empty())
{
return false;
}
else
{
for ( var CurPos = StartPos; CurPos < EndPos; CurPos++ )
......@@ -7569,6 +7573,7 @@ ParaRun.prototype.Math_SetPosition = function(pos, PosInfo)
if(this.bEqqArray)
{
var alignEven = 0;
var align = 0;
// нечетным точкам соответствуют четные индексы в массиве
......@@ -7581,42 +7586,64 @@ ParaRun.prototype.Math_SetPosition = function(pos, PosInfo)
var widthCurrPoint = 0;
for(var j = 0; j < WPointsLng; j += 2)
if(WPointsLng > 0) // есть точки выравнивания
{
widthCurrPoint = 0;
for(var j = 0; j < WPointsLng; j++)
{
widthCurrPoint = 0;
if(j == WPointsLng - 1)
align = (PosInfo.Widths[j/2] - this.WidthsPoints[j])/2; // то есть последняя точка четная, выравнивание по центру
else
align = PosInfo.Points[j/2] - this.WidthsPoints[j];
if(j == WPointsLng - 1 && this.WidthsPoints[j].odd == -1) // то есть последняя точка четная, выравнивание по центру
{
align = (PosInfo.Widths[j] - this.WidthsPoints[j].even)/2;
alignEven = 0;
}
else
{
alignEven = (PosInfo.Widths[j] - PosInfo.Points[j].even - PosInfo.Points[j].odd)/2;
align = PosInfo.Points[j].even - this.WidthsPoints[j].even;
}
NewPos.x += align;
NewPos.x += align + alignEven;
while(Pos < lng && Amp < 3)
{
if(this.Content[Pos].Type == para_Math_Ampersand)
while(Pos < lng && Amp < 3)
{
Amp++;
if(Amp < 3)
if(this.Content[Pos].Type == para_Math_Ampersand)
{
Amp++;
if(Amp < 3)
{
this.Content[Pos].setPosition(NewPos);
Pos++;
}
}
else
{
this.Content[Pos].setPosition(NewPos);
NewPos.x += this.Content[Pos].size.width;
widthCurrPoint += this.Content[Pos].size.width;
W += this.Content[Pos].size.width;
Pos++;
}
}
else
{
this.Content[Pos].setPosition(NewPos);
NewPos.x += this.Content[Pos].size.width;
widthCurrPoint += this.Content[Pos].size.width;
W += this.Content[Pos].size.width;
Pos++;
}
}
NewPos.x += PosInfo.Widths[j/2] - widthCurrPoint - align; // выравнивание справа
NewPos.x += PosInfo.Widths[j] - widthCurrPoint - align - alignEven; // выравнивание справа
Amp = 0;
Amp = 0;
}
}
else // точки выравнивания отсутсвуют
{
align = (PosInfo.Widths[0] - this.size.width)/2;
NewPos.x += align;
for(var i = 0; i < this.Content.length; i++)
{
this.Content[i].setPosition(NewPos);
NewPos.x += this.Content[i].size.width;
}
}
/*if(Pos < lng)
{
......@@ -7724,10 +7751,7 @@ ParaRun.prototype.Math_Recalculate = function(oMeasure, Parent, Paragraph, RPI,
if(RPI.bEqqArray)
{
Widths = RPI.AmperWPoints.GetWidths();
Widths[0] = 0
this.WidthsPoints.length = 0;
this.WidthsPoints[0] = 0;
Widths[0] = 0;
}
this.size.SetZero();
......@@ -7735,13 +7759,16 @@ ParaRun.prototype.Math_Recalculate = function(oMeasure, Parent, Paragraph, RPI,
var widthCurr = 0,
ascent = 0, descent = 0;
for (var i = 0 ; i < this.Content.length; i++ )
var Lng = this.Content.length;
var len, NewPoint;
for (var i = 0 ; i < Lng; i++)
{
this.Content[i].Resize(oMeasure, this, RPI);
var oSize = this.Content[i].size;
widthCurr = oSize.width + this.Content[i].GapLeft + this.Content[i].GapRight;
widthCurr = oSize.width;
this.size.width += widthCurr;
var oDescent = oSize.height - oSize.ascent;
......@@ -7776,19 +7803,50 @@ ParaRun.prototype.Math_Recalculate = function(oMeasure, Parent, Paragraph, RPI,
{
if(this.Content[i].Type == para_Math_Ampersand)
{
if(PosW % 2 == 0)
{
NewPoint = new CMathPoint();
NewPoint.even = Widths[PosW];
this.WidthsPoints.push(NewPoint);
}
else
{
len = this.WidthsPoints.length;
this.WidthsPoints[len-1].odd = Widths[PosW];
}
PosW++;
Widths[PosW] = 0;
this.WidthsPoints[PosW] = 0;
}
else
{
Widths[PosW] += widthCurr;
this.WidthsPoints[PosW] += widthCurr;
}
}
}
len = this.WidthsPoints.length;
if(RPI.bEqqArray && len > 0)
{
if(PosW%2 == 0)
{
NewPoint = new CMathPoint();
NewPoint.even = Widths[PosW];
NewPoint.odd = -1;
this.WidthsPoints.push(NewPoint);
}
else
{
this.WidthsPoints[len-1].odd = Widths[PosW];
}
}
this.size.ascent = ascent;
this.size.height = ascent + descent;
}
......@@ -7821,52 +7879,6 @@ ParaRun.prototype.Set_MathPrp = function(props)
{
this.MathPrp.setMathProps(props);
}
/*ParaRun.prototype.Apply_StyleBold = function(Value)
{
if(Value == undefined)
Value = false;
if(Value == true)
{
if(this.MathPrp.sty == STY_ITALIC)
this.Apply_Style(STY_BI);
else if(this.MathPrp.sty == STY_PLAIN)
this.Apply_Style(STY_BOLD);
}
else if(Value == false)
{
if(this.MathPrp.sty == STY_BI)
this.Apply_Style(STY_ITALIC);
else if(this.MathPrp.sty == STY_BOLD)
this.Apply_Style(STY_PLAIN);
}
}
ParaRun.prototype.Apply_StyleItalic = function(Value)
{
if(Value == undefined)
Value = true;
if(Value == true)
{
if(this.MathPrp.sty == STY_BOLD)
this.Apply_Style(STY_BI);
else if(this.MathPrp.sty == STY_PLAIN)
this.Apply_Style(STY_ITALIC);
else
this.Apply_Style(STY_ITALIC);
}
else if(Value == false)
{
if(this.MathPrp.sty == STY_BI)
this.Apply_Style(STY_BOLD);
else if(this.MathPrp.sty == STY_ITALIC)
this.Apply_Style(STY_PLAIN);
else
this.Apply_Style(STY_PLAIN);
}
}*/
ParaRun.prototype.Math_Apply_Style = function(Value)
{
if(Value !== this.MathPrp.sty)
......@@ -7909,12 +7921,15 @@ ParaRun.prototype.Math_SetGaps = function(GapsInfo)
for (var Pos = 0 ; Pos < this.Content.length; Pos++ )
{
GapsInfo.leftRunPrp = GapsInfo.currRunPrp;
GapsInfo.Left = GapsInfo.Current;
if( !this.Content[Pos].IsAlignPoint() )
{
GapsInfo.leftRunPrp = GapsInfo.currRunPrp;
GapsInfo.Left = GapsInfo.Current;
GapsInfo.currRunPrp = oWPrp;
GapsInfo.Current = this.Content[Pos];
GapsInfo.setGaps();
GapsInfo.currRunPrp = oWPrp;
GapsInfo.Current = this.Content[Pos];
GapsInfo.setGaps();
}
}
}
ParaRun.prototype.IsPlaceholder = function()
......
Word/Math/mathContent.js
View file @ a428bd91
......@@ -3882,6 +3882,8 @@ CMathContent.prototype =
if (!this.bRoot && this.content.length == 0)
this.fillPlaceholders();
this.WidthToElement.length = 0;
var lng = this.content.length;
this.size.SetZero();
......
Word/Math/mathText.js
View file @ a428bd91
......@@ -480,9 +480,6 @@ CMathText.prototype =
height = g_oTextMeasurer.GetHeight();
*/
this.GapLeft = 0;
this.GapRight = 0;
if(!this.bJDraw)
this.Parent = Parent;
else
......@@ -514,12 +511,12 @@ CMathText.prototype =
width = metricsTxt.Width;
//width = metricsTxt.Width + this.GapLeft + this.GapRight;
this.WidthVisible = width;
this.size.width = this.GapLeft + this.GapRight + width;
this.size.height = height;
this.size.ascent = ascent;
this.WidthVisible = this.size.width;
//this.size = {width: width, widthG: width, height: height, ascent: ascent};
},
/*ApplyGaps: function()
......@@ -637,6 +634,10 @@ CMathText.prototype =
{
return this.Type == para_Math_Placeholder;
},
IsAlignPoint: function()
{
return false
},
// For ParaRun
Is_Punctuation: function()
{
......@@ -711,6 +712,9 @@ function CMathAmp()
this.bEqqArray = false;
this.Type = para_Math_Ampersand;
this.GapLeft = 0;
this.GapRight = 0;
this.pos = new CMathPosition();
this.AmpText = new CMathText(false);
......@@ -784,6 +788,10 @@ CMathAmp.prototype =
IsAccent: function()
{
return this.Parent.IsAccent();
},
IsAlignPoint: function()
{
return this.Type == para_Math_Ampersand;
}
}
......
Word/Math/matrix.js
View file @ a428bd91
......@@ -647,6 +647,12 @@ CMathMatrix.prototype.Get_Id = function()
return this.Id;
}
function CMathPoint()
{
this.even = 0;
this.odd = 0;
}
////
function CEqArray(props)
{
......@@ -755,6 +761,7 @@ CEqArray.prototype.getMetrics = function(RPI)
odd = 0;
last = 0;
for(var i = 0; i < this.nRow; i++)
{
var W = RPI.AmperWPoints.Widths[i],
......@@ -776,15 +783,19 @@ CEqArray.prototype.getMetrics = function(RPI)
var w = even + odd > last ? even + odd : last;
var NewPoint = new CMathPoint();
NewPoint.even = even;
NewPoint.odd = odd;
this.WidthsPoints.push(w);
this.Points.push(even);
this.Points.push(NewPoint);
WidthsMetrics[0] += w;
Pos += 2;
}
if(true)
/*if(true)
{
var str = "";
......@@ -795,7 +806,7 @@ CEqArray.prototype.getMetrics = function(RPI)
}
console.log(str);
}
}*/
for(var i = 0; i < this.nRow; i++)
{
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7