Skip to content

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

Заменила i,j для аксента на соответствующие стилям i,j без точек 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58615 954022d7-b5bf-4e40-9824-e11837661b57
parent c5f7bf0c
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 26 deletions
Word/Math/accent.js
View file @ 738adde5
...@@ -135,7 +135,7 @@ CAccentLine.prototype.calcSize = function(stretch) ...@@ -135,7 +135,7 @@ CAccentLine.prototype.calcSize = function(stretch)
return {width: width, height: height}; return {width: width, height: height};
} }
CAccentLine.prototype.calcCoord = function(stretch) CAccentLine.prototype.old_calcCoord = function(stretch)
{ {
var fontSize = this.Parent.Get_CompiledCtrPrp().FontSize; var fontSize = this.Parent.Get_CompiledCtrPrp().FontSize;
...@@ -155,7 +155,7 @@ CAccentLine.prototype.calcCoord = function(stretch) ...@@ -155,7 +155,7 @@ CAccentLine.prototype.calcCoord = function(stretch)
return {XX: X, YY: Y, W: W, H: H}; return {XX: X, YY: Y, W: W, H: H};
} }
CAccentLine.prototype.drawPath = function(pGraphics, XX, YY) CAccentLine.prototype.old_drawPath = function(pGraphics, XX, YY)
{ {
pGraphics._m(XX[0], YY[0]); pGraphics._m(XX[0], YY[0]);
pGraphics._l(XX[1], YY[1]); pGraphics._l(XX[1], YY[1]);
...@@ -203,7 +203,7 @@ CAccentDoubleLine.prototype.calcSize = function(stretch) ...@@ -203,7 +203,7 @@ CAccentDoubleLine.prototype.calcSize = function(stretch)
return {width: width, height: height}; return {width: width, height: height};
} }
CAccentDoubleLine.prototype.calcCoord = function(stretch) CAccentDoubleLine.prototype.old_calcCoord = function(stretch)
{ {
var fontSize = this.Parent.Get_CompiledCtrPrp().FontSize; var fontSize = this.Parent.Get_CompiledCtrPrp().FontSize;
...@@ -227,7 +227,7 @@ CAccentDoubleLine.prototype.calcCoord = function(stretch) ...@@ -227,7 +227,7 @@ CAccentDoubleLine.prototype.calcCoord = function(stretch)
return {XX: X, YY: Y, W: W, H: H}; return {XX: X, YY: Y, W: W, H: H};
} }
CAccentDoubleLine.prototype.drawPath = function(pGraphics, XX, YY) CAccentDoubleLine.prototype.old_drawPath = function(pGraphics, XX, YY)
{ {
pGraphics._m(XX[0], YY[0]); pGraphics._m(XX[0], YY[0]);
pGraphics._l(XX[1], YY[1]); pGraphics._l(XX[1], YY[1]);
...@@ -593,10 +593,11 @@ CAccent.prototype.draw = function(x, y, pGraphics) ...@@ -593,10 +593,11 @@ CAccent.prototype.draw = function(x, y, pGraphics)
if(Info.Result == true) if(Info.Result == true)
{ {
var bStyle = Info.sty == STY_BI || Info.sty == STY_ITALIC, var bAlphabet = Info.Latin || Info.Greek;
bScript = Info.scr == TXT_ROMAN || Info.scr == TXT_SANS_SERIF; var bRomanSerif = (Info.sty == STY_BI || Info.sty == STY_ITALIC) && (Info.scr == TXT_ROMAN || Info.scr == TXT_SANS_SERIF),
bScript = Info.scr == TXT_SCRIPT;
if(bStyle && bScript && (Info.Latin || Info.Greek)) if(bAlphabet && (bRomanSerif || bScript))
{ {
if(this.Pr.chr != 0x305 && this.Pr.chr >= 0x300 && this.Pr.chr <= 0x315 || this.Pr.chr == 0x20DB) if(this.Pr.chr != 0x305 && this.Pr.chr >= 0x300 && this.Pr.chr <= 0x315 || this.Pr.chr == 0x20DB)
{ {
...@@ -614,7 +615,7 @@ CAccent.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine, ...@@ -614,7 +615,7 @@ CAccent.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine,
SearchPos.CurX += this.GapLeft + align; SearchPos.CurX += this.GapLeft + align;
var result = this.elements[0][0].Get_ParaContentPosByXY(SearchPos, Depth+2, _CurLine, _CurRange, StepEnd); var result = this.elements[0][0].Get_ParaContentPosByXY(SearchPos, Depth+2, _CurLine, _CurRange, StepEnd);
if(result) if(result)
{ {
......
Word/Math/mathText.js
View file @ 738adde5
...@@ -21,6 +21,10 @@ var StartTextElement = 0x2B1A; // Cambria Math ...@@ -21,6 +21,10 @@ var StartTextElement = 0x2B1A; // Cambria Math
// смена хентов // смена хентов
// editor.SetFontRenderingMode(2); // editor.SetFontRenderingMode(2);
//change FontSize
//editor.put_TextPrFontSize(parseInt("37"));
function CMathSize() function CMathSize()
{ {
this.width = 0; this.width = 0;
...@@ -109,10 +113,14 @@ CMathText.prototype = ...@@ -109,10 +113,14 @@ CMathText.prototype =
{ {
if(code == 0x68) // h if(code == 0x68) // h
code = 0x210E; code = 0x210E;
else if((code == 0x69 && bAccent) || code == 0x131) // "i" with dot || "i" dotless plain => "i" dotless italic /*else if((code == 0x69 && bAccent) || code == 0x131) // "i" with dot || "i" dotless plain => "i" dotless italic
code = 0x1D6A4; code = 0x1D6A4;
else if((code == 0x6A && bAccent) ||code == 0x237) // "j" with dot || "j" dotless plain => "j" dotless italic else if((code == 0x6A && bAccent) ||code == 0x237) // "j" with dot || "j" dotless plain => "j" dotless italic
code = 0x1D6A5; code = 0x1D6A5;*/
else if(code == 0x69 && bAccent)
code = 2835;
else if(code == 0x6A && bAccent)
code = 2836;
else if(bCapitale) else if(bCapitale)
code = code + 0x1D3F3; code = code + 0x1D3F3;
else if(bSmall) else if(bSmall)
...@@ -143,7 +151,11 @@ CMathText.prototype = ...@@ -143,7 +151,11 @@ CMathText.prototype =
} }
else if(Sty == STY_BI) else if(Sty == STY_BI)
{ {
if(bCapitale) if(code == 0x69 && bAccent)
code = 2841;
else if(code == 0x6A && bAccent)
code = 2842;
else if(bCapitale)
code = code + 0x1D427; code = code + 0x1D427;
else if(bSmall) else if(bSmall)
code = code + 0x1D421; code = code + 0x1D421;
...@@ -174,7 +186,11 @@ CMathText.prototype = ...@@ -174,7 +186,11 @@ CMathText.prototype =
} }
else if(Sty == STY_BOLD) else if(Sty == STY_BOLD)
{ {
if(bCapitale) if(code == 0x69 && bAccent)
code = 2829;
else if(code == 0x6A && bAccent)
code = 2830;
else if(bCapitale)
code = code + 0x1D3BF; code = code + 0x1D3BF;
else if(bSmall) else if(bSmall)
code = code + 0x1D3B9; code = code + 0x1D3B9;
...@@ -211,16 +227,26 @@ CMathText.prototype = ...@@ -211,16 +227,26 @@ CMathText.prototype =
{ {
if(bAccent) if(bAccent)
{ {
if(code == 0x69) // "i" with dot => "i" dotless plain /*if(code == 0x69) // "i" with dot => "i" dotless plain
code = 0x131; code = 0x131;
else if(code == 0x6A) // "j" with dot => "j" dotless plain else if(code == 0x6A) // "j" with dot => "j" dotless plain
code = 0x237; code = 0x237;*/
if(code == 0x69 && bAccent)
code = 199;
else if(code == 0x6A && bAccent)
code = 2828;
} }
} }
} }
else if(Scr == TXT_DOUBLE_STRUCK) else if(Scr == TXT_DOUBLE_STRUCK)
{ {
if(code == 0x43) // C if(code == 0x69 && bAccent)
code = 2851;
else if(code == 0x6A && bAccent)
code = 2852;
else if(code == 0x43) // C
code = 0x2102; code = 0x2102;
else if(code == 0x48) // H else if(code == 0x48) // H
code = 0x210D; code = 0x210D;
...@@ -299,7 +325,11 @@ CMathText.prototype = ...@@ -299,7 +325,11 @@ CMathText.prototype =
} }
else if(Scr == TXT_MONOSPACE) else if(Scr == TXT_MONOSPACE)
{ {
if(bCapitale) if(code == 0x69 && bAccent)
code = 4547;
else if(code == 0x6A && bAccent)
code = 4548;
else if(bCapitale)
code = code + 0x1D62F; code = code + 0x1D62F;
else if(bSmall) else if(bSmall)
code = code + 0x1D629; code = code + 0x1D629;
...@@ -310,14 +340,22 @@ CMathText.prototype = ...@@ -310,14 +340,22 @@ CMathText.prototype =
{ {
if(Sty == STY_BOLD ||Sty == STY_BI) if(Sty == STY_BOLD ||Sty == STY_BI)
{ {
if(bCapitale) if(code == 0x69 && bAccent)
code = 2849;
else if(code == 0x6A && bAccent)
code = 2850;
else if(bCapitale)
code = code + 0x1D52B; code = code + 0x1D52B;
else if(bSmall) else if(bSmall)
code = code + 0x1D525; code = code + 0x1D525;
} }
else else
{ {
if(code == 0x43) // C if(code == 0x69 && bAccent)
code = 2847;
else if(code == 0x6A && bAccent)
code = 2848;
else if(code == 0x43) // C
code = 0x212D; code = 0x212D;
else if(code == 0x48) // H else if(code == 0x48) // H
code = 0x210C; code = 0x210C;
...@@ -338,7 +376,11 @@ CMathText.prototype = ...@@ -338,7 +376,11 @@ CMathText.prototype =
{ {
if(Sty == STY_ITALIC) if(Sty == STY_ITALIC)
{ {
if(bCapitale) if(code == 0x69 && bAccent)
code = 2857;
else if(code == 0x6A && bAccent)
code = 2858;
else if(bCapitale)
code = code + 0x1D5C7; code = code + 0x1D5C7;
else if(bSmall) else if(bSmall)
code = code + 0x1D5C1; code = code + 0x1D5C1;
...@@ -347,7 +389,11 @@ CMathText.prototype = ...@@ -347,7 +389,11 @@ CMathText.prototype =
} }
else if(Sty == STY_BOLD) else if(Sty == STY_BOLD)
{ {
if(bCapitale) if(code == 0x69 && bAccent)
code = 2855;
else if(code == 0x6A && bAccent)
code = 2856;
else if(bCapitale)
code = code + 0x1D593; code = code + 0x1D593;
else if(bSmall) else if(bSmall)
code = code + 0x1D58D; code = code + 0x1D58D;
...@@ -378,7 +424,11 @@ CMathText.prototype = ...@@ -378,7 +424,11 @@ CMathText.prototype =
} }
else if(Sty == STY_BI) else if(Sty == STY_BI)
{ {
if(bCapitale) if(code == 0x69 && bAccent)
code = 2859;
else if(code == 0x6A && bAccent)
code = 2860;
else if(bCapitale)
code = code + 0x1D5FB; code = code + 0x1D5FB;
else if(bSmall) else if(bSmall)
code = code + 0x1D5F5; code = code + 0x1D5F5;
...@@ -409,7 +459,11 @@ CMathText.prototype = ...@@ -409,7 +459,11 @@ CMathText.prototype =
} }
else else
{ {
if(bCapitale) if(code == 0x69 && bAccent)
code = 2853;
else if(code == 0x6A && bAccent)
code = 2854;
else if(bCapitale)
code = code + 0x1D55F; code = code + 0x1D55F;
else if(bSmall) else if(bSmall)
code = code + 0x1D559; code = code + 0x1D559;
...@@ -422,7 +476,11 @@ CMathText.prototype = ...@@ -422,7 +476,11 @@ CMathText.prototype =
{ {
if(Sty == STY_ITALIC || Sty == STY_PLAIN) if(Sty == STY_ITALIC || Sty == STY_PLAIN)
{ {
if(code == 0x42) // B if(code == 0x69 && bAccent)
code = 2843;
else if(code == 0x6A && bAccent)
code = 2844;
else if(code == 0x42) // B
code = 0x212C; code = 0x212C;
else if(code == 0x45) // E else if(code == 0x45) // E
code = 0x2130; code = 0x2130;
...@@ -451,7 +509,11 @@ CMathText.prototype = ...@@ -451,7 +509,11 @@ CMathText.prototype =
} }
else else
{ {
if(bCapitale) if(code == 0x69 && bAccent)
code = 2845;
else if(code == 0x6A && bAccent)
code = 2846;
else if(bCapitale)
code = code + 0x1D48F; code = code + 0x1D48F;
else if(bSmall) else if(bSmall)
code = code + 0x1D489; code = code + 0x1D489;
...@@ -485,6 +547,13 @@ CMathText.prototype = ...@@ -485,6 +547,13 @@ CMathText.prototype =
var letter = this.getCode(); var letter = this.getCode();
var bAccentIJ = this.bJDraw ? false : this.Parent.IsAccent();
bAccentIJ = bAccentIJ && (this.value == 0x69 || this.value == 0x6A);
if(bAccentIJ)
oMeasure.SetStringGid(true);
var metricsTxt; var metricsTxt;
if(this.bJDraw) if(this.bJDraw)
...@@ -492,6 +561,9 @@ CMathText.prototype = ...@@ -492,6 +561,9 @@ CMathText.prototype =
else else
metricsTxt = oMeasure.MeasureCode(letter); metricsTxt = oMeasure.MeasureCode(letter);
if(bAccentIJ)
oMeasure.SetStringGid(false);
// смещения // смещения
this.rasterOffsetX = metricsTxt.rasterOffsetX; this.rasterOffsetX = metricsTxt.rasterOffsetX;
this.rasterOffsetY = metricsTxt.rasterOffsetY; this.rasterOffsetY = metricsTxt.rasterOffsetY;
...@@ -550,7 +622,12 @@ CMathText.prototype = ...@@ -550,7 +622,12 @@ CMathText.prototype =
pGraphics.transform(sx, shy, shx, sy, 0, 0);*/ pGraphics.transform(sx, shy, shx, sy, 0, 0);*/
pGraphics.FillTextCode(X, Y, this.getCode()); //на отрисовку символа отправляем положение baseLine var bAccent = this.bJDraw ? false : this.Parent.IsAccent();
if(bAccent && (this.value == 0x69 || this.value == 0x6A))
pGraphics.tg(this.getCode(), X, Y);
else
pGraphics.FillTextCode(X, Y, this.getCode()); //на отрисовку символа отправляем положение baseLine
}, },
setPosition: function(pos) setPosition: function(pos)
......
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