Skip to content

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

1. к rev 68245 

2. заменены коды греческих прописных букв, добавляемых из меню. После правки курсивные буквы генерируются в те же символы, что и раньше, а буквы bold, bold-italic, plain преобразуются теперь корректно в нужные символы.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68251 954022d7-b5bf-4e40-9824-e11837661b57
parent 238b3100
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 31 deletions
Word/Editor/Run.js
View file @ a9247ae1
...@@ -9903,6 +9903,16 @@ ParaRun.prototype.getPropsForWrite = function() ...@@ -9903,6 +9903,16 @@ ParaRun.prototype.getPropsForWrite = function()
return {wRPrp: wRPrp, mathRPrp: mathRPrp}; return {wRPrp: wRPrp, mathRPrp: mathRPrp};
}; };
ParaRun.prototype.Get_MathPr = function(bCopy)
{
if(this.Type = para_Math_Run)
{
if(bCopy)
return this.MathPrp.Copy();
else
return this.MathPrp;
}
};
ParaRun.prototype.Math_PreRecalc = function(Parent, ParaMath, ArgSize, RPI, GapsInfo) ParaRun.prototype.Math_PreRecalc = function(Parent, ParaMath, ArgSize, RPI, GapsInfo)
{ {
this.Parent = Parent; this.Parent = Parent;
......
Word/Math/borderBox.js
View file @ a9247ae1
...@@ -567,7 +567,7 @@ CMathMenuBorderBox.prototype.put_HideTopLTR = function(bHideTopLTR){this.HideTop ...@@ -567,7 +567,7 @@ CMathMenuBorderBox.prototype.put_HideTopLTR = function(bHideTopLTR){this.HideTop
CMathMenuBorderBox.prototype.get_HideTopRTL = function(){return this.HideTopRTL;}; CMathMenuBorderBox.prototype.get_HideTopRTL = function(){return this.HideTopRTL;};
CMathMenuBorderBox.prototype.put_HideTopRTL = function(bHideTopRTL){this.HideTopRTL = bHideTopRTL;}; CMathMenuBorderBox.prototype.put_HideTopRTL = function(bHideTopRTL){this.HideTopRTL = bHideTopRTL;};
window["CMathMenuBorderBox"] = CMathMenuBorderBox; window["CMathMenuBorderBox"] = CMathMenuBorderBox;
CMathMenuBorderBox.prototype["get_HideTop"] = CMathMenuBorderBox.prototype.get_HideTop; CMathMenuBorderBox.prototype["get_HideTop"] = CMathMenuBorderBox.prototype.get_HideTop;
CMathMenuBorderBox.prototype["put_HideTop"] = CMathMenuBorderBox.prototype.put_HideTop; CMathMenuBorderBox.prototype["put_HideTop"] = CMathMenuBorderBox.prototype.put_HideTop;
CMathMenuBorderBox.prototype["get_HideBottom"] = CMathMenuBorderBox.prototype.get_HideBottom; CMathMenuBorderBox.prototype["get_HideBottom"] = CMathMenuBorderBox.prototype.get_HideBottom;
......
Word/Math/mathContent.js
View file @ a9247ae1
...@@ -2275,36 +2275,36 @@ CMathContent.prototype.private_LoadFromMenuSymbol = function(Type, Pr) ...@@ -2275,36 +2275,36 @@ CMathContent.prototype.private_LoadFromMenuSymbol = function(Type, Pr)
case c_oAscMathType.Symbol_aleph : Code = 0x2135; break; case c_oAscMathType.Symbol_aleph : Code = 0x2135; break;
case c_oAscMathType.Symbol_beth : Code = 0x2136; break; case c_oAscMathType.Symbol_beth : Code = 0x2136; break;
case c_oAscMathType.Symbol_QED : Code = 0x220E; break; case c_oAscMathType.Symbol_QED : Code = 0x220E; break;
case c_oAscMathType.Symbol_alpha : Code = 0x1D6FC; break; case c_oAscMathType.Symbol_alpha : Code = 0x03B1; break;
case c_oAscMathType.Symbol_beta : Code = 0x1D6FD; break; case c_oAscMathType.Symbol_beta : Code = 0x03B2; break;
case c_oAscMathType.Symbol_gamma : Code = 0x1D6FE; break; case c_oAscMathType.Symbol_gamma : Code = 0x03B3; break;
case c_oAscMathType.Symbol_delta : Code = 0x1D6FF; break; case c_oAscMathType.Symbol_delta : Code = 0x03B4; break;
case c_oAscMathType.Symbol_varepsilon : Code = 0x1D700; break; case c_oAscMathType.Symbol_varepsilon : Code = 0x03B5; break;
case c_oAscMathType.Symbol_epsilon : Code = 0x1D716; break; case c_oAscMathType.Symbol_epsilon : Code = 0x03F5; break;
case c_oAscMathType.Symbol_zeta : Code = 0x1D701; break; case c_oAscMathType.Symbol_zeta : Code = 0x03B6; break;
case c_oAscMathType.Symbol_eta : Code = 0x1D702; break; case c_oAscMathType.Symbol_eta : Code = 0x03B7; break;
case c_oAscMathType.Symbol_theta : Code = 0x1D703; break; case c_oAscMathType.Symbol_theta : Code = 0x03B8; break;
case c_oAscMathType.Symbol_vartheta : Code = 0x1D717; break; case c_oAscMathType.Symbol_vartheta : Code = 0x03D1; break;
case c_oAscMathType.Symbol_iota : Code = 0x1D704; break; case c_oAscMathType.Symbol_iota : Code = 0x03B9; break;
case c_oAscMathType.Symbol_kappa : Code = 0x1D705; break; case c_oAscMathType.Symbol_kappa : Code = 0x03BA; break;
case c_oAscMathType.Symbol_lambda : Code = 0x1D706; break; case c_oAscMathType.Symbol_lambda : Code = 0x03BB; break;
case c_oAscMathType.Symbol_mu : Code = 0x1D707; break; case c_oAscMathType.Symbol_mu : Code = 0x03BC; break;
case c_oAscMathType.Symbol_nu : Code = 0x1D708; break; case c_oAscMathType.Symbol_nu : Code = 0x03BD; break;
case c_oAscMathType.Symbol_xsi : Code = 0x1D709; break; case c_oAscMathType.Symbol_xsi : Code = 0x03BE; break;
case c_oAscMathType.Symbol_o : Code = 0x1D70A; break; case c_oAscMathType.Symbol_o : Code = 0x03BF; break;
case c_oAscMathType.Symbol_pi : Code = 0x1D70B; break; case c_oAscMathType.Symbol_pi : Code = 0x03C0; break;
case c_oAscMathType.Symbol_varpi : Code = 0x1D71B; break; case c_oAscMathType.Symbol_varpi : Code = 0x03D6; break;
case c_oAscMathType.Symbol_rho : Code = 0x1D70C; break; case c_oAscMathType.Symbol_rho : Code = 0x03C1; break;
case c_oAscMathType.Symbol_varrho : Code = 0x1D71A; break; case c_oAscMathType.Symbol_varrho : Code = 0x03F1; break;
case c_oAscMathType.Symbol_sigma : Code = 0x1D70E; break; case c_oAscMathType.Symbol_sigma : Code = 0x03C3; break;
case c_oAscMathType.Symbol_varsigma : Code = 0x1D70D; break; case c_oAscMathType.Symbol_varsigma : Code = 0x03C2; break;
case c_oAscMathType.Symbol_tau : Code = 0x1D70F; break; case c_oAscMathType.Symbol_tau : Code = 0x03C4; break;
case c_oAscMathType.Symbol_upsilon : Code = 0x1D710; break; case c_oAscMathType.Symbol_upsilon : Code = 0x03C5; break;
case c_oAscMathType.Symbol_varphi : Code = 0x1D711; break; case c_oAscMathType.Symbol_varphi : Code = 0x03C6; break;
case c_oAscMathType.Symbol_phi : Code = 0x1D719; break; case c_oAscMathType.Symbol_phi : Code = 0x03D5; break;
case c_oAscMathType.Symbol_chi : Code = 0x1D712; break; case c_oAscMathType.Symbol_chi : Code = 0x03C7; break;
case c_oAscMathType.Symbol_psi : Code = 0x1D713; break; case c_oAscMathType.Symbol_psi : Code = 0x03C8; break;
case c_oAscMathType.Symbol_omega : Code = 0x1D714; break; case c_oAscMathType.Symbol_omega : Code = 0x03C9; break;
case c_oAscMathType.Symbol_Alpha : Code = 0x0391; break; case c_oAscMathType.Symbol_Alpha : Code = 0x0391; break;
case c_oAscMathType.Symbol_Beta : Code = 0x0392; break; case c_oAscMathType.Symbol_Beta : Code = 0x0392; break;
case c_oAscMathType.Symbol_Gamma : Code = 0x0393; break; case c_oAscMathType.Symbol_Gamma : Code = 0x0393; break;
...@@ -2338,6 +2338,7 @@ CMathContent.prototype.private_LoadFromMenuSymbol = function(Type, Pr) ...@@ -2338,6 +2338,7 @@ CMathContent.prototype.private_LoadFromMenuSymbol = function(Type, Pr)
if(this.Content.length > 0 && this.Content[this.CurPos].Type == para_Math_Run && this.Selection_IsEmpty() == true) // находимся в Run, селект отсутствует if(this.Content.length > 0 && this.Content[this.CurPos].Type == para_Math_Run && this.Selection_IsEmpty() == true) // находимся в Run, селект отсутствует
{ {
TextPr = this.Content[this.CurPos].Get_TextPr(); TextPr = this.Content[this.CurPos].Get_TextPr();
TextPr.RFonts.Set_All("Cambria Math", -1); // на данный момент добавляются символы исключительно из Cambria Math
MathPr = this.Content[this.CurPos].Get_MathPr(); MathPr = this.Content[this.CurPos].Get_MathPr();
} }
......
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