Skip to content

S
sdkjs
Commit d124d726 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov
Browse files
Options

Переделана работа с настройками текста в формулах, переделана компиляция настроек. 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58753 954022d7-b5bf-4e40-9824-e11837661b57
parent a784ae8d
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 144 deletions
Word/Editor/Math.js
View file @ d124d726
......@@ -8,6 +8,10 @@ var Math_Date_Draw = 0;*/
/**
* Created by Ilja.Kirillov on 18.03.14.
*/
var g_dMathArgSizeKoeff_1 = 0.76;
var g_dMathArgSizeKoeff_2 = 0.76 * 0.855;
var g_oMathSettings = {};
function MathMenu (type)
{
......@@ -103,6 +107,7 @@ ParaMath.prototype.Copy = function(Selected)
/// argSize, bDot и bRoot выставить на объединении контентов
NewMath.SetNeedResize();
NewMath.Root.Correct_Content(true);
return NewMath;
};
......@@ -984,49 +989,19 @@ ParaMath.prototype.MathToImageConverter= function()
return _ret;
};
ParaMath.prototype.ApplyArgSize = function(oWPrp, argSize)
{
var tPrp = new CTextPr();
tPrp.Merge(this.DefaultTextPr);
tPrp.Merge(oWPrp);
//var FSize = tPrp.FontSize;
if(argSize == -1)
{
//FSize = 0.0009*FSize*FSize + 0.68*FSize + 0.26;
tPrp.FontSize = 0.76*tPrp.FontSize;
tPrp.FontSizeCS = 0.76*tPrp.FontSizeCS;
}
else if(argSize == -2)
{
//FSize = -0.0004*FSize*FSize + 0.66*FSize + 0.87;
tPrp.FontSize = 0.76*0.855*tPrp.FontSize;
tPrp.FontSizeCS = 0.76*0.855*tPrp.FontSizeCS;
}
//tPrp.FontSize = FSize;
oWPrp.Merge(tPrp);
};
ParaMath.prototype.ApplyArgSize_2 = function(oWPrp, argSize)
ParaMath.prototype.ApplyArgSize = function(FontSize, argSize)
{
var ResultFontSize = FontSize;
if(argSize == -1)
{
//FSize = 0.0009*FSize*FSize + 0.68*FSize + 0.26;
oWPrp.FontSize = 0.76*oWPrp.FontSize;
oWPrp.FontSizeCS = 0.76*oWPrp.FontSizeCS;
ResultFontSize *= g_dMathArgSizeKoeff_1;
}
else if(argSize == -2)
{
//FSize = -0.0004*FSize*FSize + 0.66*FSize + 0.87;
oWPrp.FontSize = 0.76*0.855*oWPrp.FontSize;
oWPrp.FontSizeCS = 0.76*0.855*oWPrp.FontSizeCS;
ResultFontSize *= g_dMathArgSizeKoeff_2;
}
return ResultFontSize;
};
ParaMath.prototype.GetFirstRPrp = function()
......@@ -1143,45 +1118,7 @@ ParaMath.prototype.GetMathPr = function()
ParaMath.prototype.Get_Default_TPrp = function()
{
/*var TextPrp = new CTextPr();
TextPrp.Init_Default();
var mathFont = new CTextPr();
var obj =
{
FontFamily: {Name : "Cambria Math", Index : -1 },
RFonts:
{
Ascii: {Name : "Cambria Math", Index : -1 }
}
};
mathFont.Set_FromObject(obj);
TextPrp.Merge(mathFont);*/
/*var DefaultPrp =
{
FontFamily: {Name : "Cambria Math", Index : -1 },
RFonts:
{
Ascii: {Name : "Cambria Math", Index : -1 }
},
FontSize: 11,
FontSizeCS: 11,
Italic: true,
Bold: false
};
TextPrp.Set_FromObject(DefaultPrp);*/
var DefaultTextPrp = this.DefaultTextPr.Copy();
DefaultTextPrp.Italic = false;
return DefaultTextPrp;
return this.DefaultTextPr;
};
ParaMath.prototype.Set_Select_ToMComp = function(Direction)
......
Word/Editor/Run.js
View file @ d124d726
......@@ -40,6 +40,7 @@ function ParaRun(Paragraph, bMathRun)
{
this.Type = para_Math_Run;
this.ParaMath = null;
this.Parent = null;
this.ArgSize = 0;
this.bEqqArray = false;
......@@ -1175,16 +1176,16 @@ ParaRun.prototype.Create_FontMap = function(Map, ArgSize)
if(this.Type === para_Math_Run)
{
TextPr = this.Get_CompiledPr(false);
FontSize = TextPr.FontSize;
FontSizeCS = TextPr.FontSizeCS;
if(this.Parent !== null)
this.Parent.ParaMath.ApplyArgSize_2(TextPr, ArgSize.value);
TextPr.FontSize = this.Parent.ParaMath.ApplyArgSize(TextPr.FontSize, ArgSize.value);
}
else
TextPr = this.Get_CompiledPr(false);
TextPr.Document_CreateFontMap( Map, this.Paragraph.Get_Theme().themeElements.fontScheme);
TextPr.Document_CreateFontMap(Map, this.Paragraph.Get_Theme().themeElements.fontScheme);
var Count = this.Content.length;
for (var Index = 0; Index < Count; Index++)
{
......@@ -4604,6 +4605,15 @@ ParaRun.prototype.Internal_Compile_Pr = function ()
if(this.Type == para_Math_Run)
{
if (undefined === this.Parent || null === this.Parent)
{
// Сюда мы никогда не должны попадать, но на всякий случай,
// чтобы не выпадало ошибок сгенерим дефолтовые настройки
var TextPr = new CTextPr();
TextPr.Init_Default();
return new CTextPr();
}
// Not Apply ArgSize !
var oWPrp = this.Parent.Get_Default_TPrp();
TextPr.Merge(oWPrp);
......@@ -7731,44 +7741,30 @@ ParaRun.prototype.Math_Draw = function(x, y, pGraphics)
var Y = y + this.size.ascent;
var oWPrp = this.Get_CompiledPr(false);
var Bold = oWPrp.Bold,
Italic = oWPrp.Italic;
var FontFamily = oWPrp.FontFamily,
FontSize = oWPrp.FontSize,
FontSizeCS = oWPrp.FontSizeCS,
RFonts = oWPrp.RFonts.Copy();
this.Parent.ParaMath.ApplyArgSize_2(oWPrp, this.Parent.Compiled_ArgSz.value);
var Font =
{
Bold : oWPrp.Bold,
Italic : oWPrp.Italic,
FontFamily : {Name : oWPrp.FontFamily.Name, Index : oWPrp.FontFamily.Index},
FontSize : this.Parent.ParaMath.ApplyArgSize(oWPrp.FontSize, this.Parent.Compiled_ArgSz.value)
};
if(!this.IsNormalText()) // выставляем false, чтобы не применился наклон к спец символам
{
oWPrp.Italic = false;
oWPrp.Bold = false;
// TO DO
// реализовать получше
// пока так
Font.Italic = false;
Font.Bold = false;
var defaultTxtPrp = this.Parent.ParaMath.Get_Default_TPrp();
oWPrp.FontFamily = defaultTxtPrp.FontFamily;
oWPrp.RFonts.Set_All(defaultTxtPrp.FontFamily.Name, defaultTxtPrp.FontFamily.Index);
Font.FontFamily.Name = defaultTxtPrp.FontFamily.Name;
Font.FontFamily.Index = defaultTxtPrp.FontFamily.Index;
}
pGraphics.SetFont(oWPrp);
pGraphics.SetFont(Font);
pGraphics.b_color1(0,0,0,255);
for(var i=0; i < this.Content.length;i++)
this.Content[i].draw(X, Y, pGraphics);
oWPrp.RFonts = RFonts;
oWPrp.FontFamily = FontFamily;
oWPrp.Bold = Bold;
oWPrp.Italic = Italic;
oWPrp.FontSize = FontSize;
oWPrp.FontSizeCS = FontSizeCS;
}
ParaRun.prototype.Math_Recalculate = function(oMeasure, Parent, Paragraph, RPI, ArgSize, WidthPoints)
{
......@@ -7797,34 +7793,28 @@ ParaRun.prototype.Math_Recalculate = function(oMeasure, Parent, Paragraph, RPI,
if(RPI.NeedResize)
{
//RPI.UpdateMathPr = this.UpdateMathPr;
var oWPrp = this.Get_CompiledPr(false);
var Bold = oWPrp.Bold;
var Italic = oWPrp.Italic;
var FontFamily = oWPrp.FontFamily,
FontSize = oWPrp.FontSize,
FontSizeCS = oWPrp.FontSizeCS,
RFonts = oWPrp.RFonts.Copy();
this.Parent.ParaMath.ApplyArgSize_2(oWPrp, this.Parent.Compiled_ArgSz.value);
var Font =
{
Bold : oWPrp.Bold,
Italic : oWPrp.Italic,
FontFamily : {Name : oWPrp.FontFamily.Name, Index : oWPrp.FontFamily.Index},
FontSize : this.Parent.ParaMath.ApplyArgSize(oWPrp.FontSize, this.Parent.Compiled_ArgSz.value)
};
if(!this.IsNormalText()) // выставляем false, чтобы не применился наклон к спец символам
{
oWPrp.Italic = false;
oWPrp.Bold = false;
Font.Italic = false;
Font.Bold = false;
var defaultTxtPrp = this.Parent.ParaMath.Get_Default_TPrp();
oWPrp.FontFamily = defaultTxtPrp.FontFamily;
oWPrp.RFonts.Set_All(defaultTxtPrp.FontFamily.Name, defaultTxtPrp.FontFamily.Index);
Font.FontFamily.Name = defaultTxtPrp.FontFamily.Name;
Font.FontFamily.Index = defaultTxtPrp.FontFamily.Index;
}
g_oTextMeasurer.SetFont(oWPrp);
g_oTextMeasurer.SetFont(Font);
this.bEqqArray = RPI.bEqqArray;
......@@ -7863,17 +7853,6 @@ ParaRun.prototype.Math_Recalculate = function(oMeasure, Parent, Paragraph, RPI,
this.size.ascent = ascent;
this.size.height = ascent + descent;
oWPrp.RFonts = RFonts;
oWPrp.FontFamily = FontFamily;
oWPrp.Bold = Bold;
oWPrp.Italic = Italic;
oWPrp.FontSize = FontSize;
oWPrp.FontSizeCS = FontSizeCS;
//this.UpdateMathPr = false;
}
}
ParaRun.prototype.Math_Update_Cursor = function(X, Y, CurPage, UpdateTarget)
......
Word/Math/base.js
View file @ d124d726
......@@ -131,6 +131,8 @@ CMathBase.prototype =
},*/
Get_CompiledCtrPrp: function()
{
this.Set_CompiledCtrPrp(this.ParaMath);
var CompiledCtrPrp;
if(this.bInside === true)
......@@ -140,15 +142,17 @@ CMathBase.prototype =
else
{
CompiledCtrPrp = this.Get_CompiledCtrPrp_2();
this.ParaMath.ApplyArgSize(CompiledCtrPrp, this.Parent.Get_CompiledArgSize().value);
CompiledCtrPrp.FontSize = this.ParaMath.ApplyArgSize(CompiledCtrPrp.FontSize, this.Parent.Get_CompiledArgSize().value);
}
this.ParaMath.ApplyArgSize(CompiledCtrPrp, this.ArgSize.value); // для настроек inline формул
CompiledCtrPrp.FontSize = this.ParaMath.ApplyArgSize(CompiledCtrPrp.FontSize, this.ArgSize.value);// для настроек inline формул
return CompiledCtrPrp;
},
Get_CompiledCtrPrp_2: function() // without arg Size
{
this.Set_CompiledCtrPrp(this.ParaMath);
var CompiledCtrPrp;
if(this.bInside === true)
......@@ -396,15 +400,9 @@ CMathBase.prototype =
{
if(this.RecalcInfo.bCtrPrp == true)
{
var defaultRPrp = ParaMath.GetFirstRPrp();
this.CompiledCtrPrp.Merge(defaultRPrp);
this.CompiledCtrPrp = ParaMath.GetFirstRPrp();
this.CompiledCtrPrp.Merge(this.CtrPrp);
for(var i=0; i < this.nRow; i++)
for(var j = 0; j < this.nCol; j++)
if(this.elements[i][j].Type === para_Math_Composition)
this.elements[i][j].Set_CompiledCtrPrp(ParaMath);
this.RecalcInfo.bCtrPrp = false;
}
},
......
Word/Math/fraction.js
View file @ d124d726
......@@ -45,7 +45,7 @@ CFraction.prototype.drawBarFraction = function(x, y, pGraphics)
{
//var mgCtrPrp = this.Get_CompiledCtrPrp();
var mgCtrPrp = this.Get_CompiledCtrPrp_2();
this.ParaMath.ApplyArgSize(mgCtrPrp, this.Parent.Get_CompiledArgSize().value);
mgCtrPrp.FontSize = this.ParaMath.ApplyArgSize(mgCtrPrp.FontSize, this.Parent.Get_CompiledArgSize().value);
var penW = mgCtrPrp.FontSize* 25.4/96 * 0.08;
......
Word/Math/mathContent.js
View file @ d124d726
......@@ -1010,9 +1010,10 @@ CMathContent.prototype =
for(var pos = 0; pos < lng; pos++)
{
this.content[pos].ParaMath = ParaMath;
if(this.content[pos].Type == para_Math_Composition)
{
this.content[pos].Set_CompiledCtrPrp(this.ParaMath);
this.content[pos].SetGaps(GapsInfo);
}
else if(this.content[pos].Type == para_Math_Run)
......@@ -1106,7 +1107,6 @@ CMathContent.prototype =
if(this.content[pos].Type == para_Math_Composition)
{
this.content[pos].Set_CompiledCtrPrp(this.ParaMath);
this.content[pos].SetGaps(GapsInfo);
}
else if(this.content[pos].Type == para_Math_Run)
......
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