Skip to content

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

delimiter /separator 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49610 954022d7-b5bf-4e40-9824-e11837661b57
parent 1f307b24
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 923 additions and 164 deletions
Word/Math/base.js
View file @ c90b84ff
...@@ -106,9 +106,10 @@ CMathBase.prototype = ...@@ -106,9 +106,10 @@ CMathBase.prototype =
//this.TxtPrp = new CMathTextPrp(); //this.TxtPrp = new CMathTextPrp();
this.TxtPrp.Merge(txtPrp); this.TxtPrp.Merge(txtPrp);
var tPrp = this.getTxtPrp();
for(var i=0; i < this.nRow; i++) for(var i=0; i < this.nRow; i++)
for(var j = 0; j < this.nCol; j++) for(var j = 0; j < this.nCol; j++)
this.elements[i][j].setTxtPrp(this.getTxtPrp()); this.elements[i][j].setTxtPrp(tPrp);
}, },
setOwnTPrp: function(txtPrp) setOwnTPrp: function(txtPrp)
{ {
......
Word/Math/mathContent.js
View file @ c90b84ff
...@@ -3174,83 +3174,180 @@ CMathContent.prototype = ...@@ -3174,83 +3174,180 @@ CMathContent.prototype =
break; break;
case 84: case 84:
var delim = this.addMComponent(MATH_DELIMITER); var delim = this.addMComponent(MATH_DELIMITER);
var props = /*var props =
{ {
begChr: {type: PARENTHESIS_LEFT}, begChr: {type: BRACKET_SQUARE_RIGHT},
endChr: {type: PARENTHESIS_RIGHT}, endChr: {type: BRACKET_SQUARE_LEFT},
shapeType: DELIMITER_SHAPE_MATH,
column: 1 column: 1
}; };*/
var props =
{
begChr: {type: PARENTHESIS_LEFT},
endChr: {type: PARENTHESIS_RIGHT},
shapeType: DELIMITER_SHAPE_MATH,
column: 1
};
delim.init(props); delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
/*var delim = this.addMComponent(9);
delim.init(0, 4, 0, 1);
delim.fillPlaceholders();*/
break; break;
case 85: case 85:
var delim = this.addMComponent(9); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(2, 4, 0, 1); var props =
{
begChr: {type: BRACKET_SQUARE_LEFT},
endChr: {type: BRACKET_SQUARE_RIGHT},
shapeType: DELIMITER_SHAPE_MATH,
column: 1
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
case 86: case 86:
var delim = this.addMComponent(9); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(1, 4, 0, 1); var props =
{
begChr: {type: BRACKET_CURLY_LEFT},
endChr: {type: BRACKET_CURLY_RIGHT},
shapeType: DELIMITER_SHAPE_MATH,
column: 1
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
case 87: case 87:
var delim = this.addMComponent(9); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(3, 4, 0, 1); var props =
{
begChr: {type: BRACKET_ANGLE_LEFT},
endChr: {type: BRACKET_ANGLE_RIGHT},
shapeType: DELIMITER_SHAPE_MATH,
column: 1
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
case 88: case 88:
var delim = this.addMComponent(9); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(4, 4, 0, 1); var props =
{
begChr: {type: HALF_SQUARE_LEFT},
endChr: {type: HALF_SQUARE_RIGHT},
shapeType: DELIMITER_SHAPE_MATH,
column: 1
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
case 89: case 89:
var delim = this.addMComponent(9); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(4, 4, 2, 3); var props =
{
begChr: {type: HALF_SQUARE_LEFT_UPPER},
endChr: {type: HALF_SQUARE_RIGHT_UPPER},
shapeType: DELIMITER_SHAPE_MATH,
column: 1
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
case 90: case 90:
var delim = this.addMComponent(9); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(5, 4, 0, 1); var props =
{
begChr: {type: DELIMITER_LINE},
endChr: {type: DELIMITER_LINE},
shapeType: DELIMITER_SHAPE_MATH,
column: 1
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
case 91: case 91:
var delim = this.addMComponent(9); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(6, 4, 0, 1); var props =
{
begChr: {type: DELIMITER_DOUBLE_LINE},
endChr: {type: DELIMITER_DOUBLE_LINE},
shapeType: DELIMITER_SHAPE_MATH,
column: 1
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
case 92: case 92:
var delim = this.addMComponent(9); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(2, 4, 0, 0); var props =
{
begChr: {type: BRACKET_SQUARE_LEFT},
endChr: {type: BRACKET_SQUARE_LEFT},
shapeType: DELIMITER_SHAPE_MATH,
column: 1
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
case 93: case 93:
var delim = this.addMComponent(9); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(2, 4, 1, 1); var props =
{
begChr: {type: BRACKET_SQUARE_RIGHT},
endChr: {type: BRACKET_SQUARE_RIGHT},
shapeType: DELIMITER_SHAPE_MATH,
column: 1
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
case 94: case 94:
var delim = this.addMComponent(9); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(2, 4, 1, 0); var props =
{
begChr: {type: BRACKET_SQUARE_RIGHT},
endChr: {type: BRACKET_SQUARE_LEFT},
shapeType: DELIMITER_SHAPE_MATH,
column: 1
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
case 95: case 95:
var delim = this.addMComponent(9); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(7, 4, 0, 1); var props =
{
begChr: {type: WHITE_SQUARE_LEFT},
endChr: {type: WHITE_SQUARE_RIGHT},
shapeType: DELIMITER_SHAPE_MATH,
column: 1
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
case 96: case 96:
var delim = this.addMComponent(10); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(0, 2); var props =
{
begChr: {type: PARENTHESIS_LEFT},
sepChr: {type: BRACKET_ANGLE_LEFT},
endChr: {type: BRACKET_CURLY_RIGHT},
column: 2
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
case 97: case 97:
var delim = this.addMComponent(10); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(1, 2); var props =
{
begChr: {type: PARENTHESIS_LEFT},
sepChr: {type: BRACKET_ANGLE_LEFT},
endChr: {type: BRACKET_CURLY_RIGHT},
column: 5
};
delim.init(props);
delim.fillPlaceholders(); delim.fillPlaceholders();
break; break;
break;
case 98: case 98:
var delim = this.addMComponent(10); var delim = this.addMComponent(10);
delim.init(3, 2); delim.init(3, 2);
......
Word/Math/mathTypes.js
View file @ c90b84ff
...@@ -58,19 +58,19 @@ var BRACKET_SQUARE_LEFT = 4; ...@@ -58,19 +58,19 @@ var BRACKET_SQUARE_LEFT = 4;
var BRACKET_SQUARE_RIGHT = 5; var BRACKET_SQUARE_RIGHT = 5;
var BRACKET_ANGLE_LEFT = 6; var BRACKET_ANGLE_LEFT = 6;
var BRACKET_ANGLE_RIGHT = 7; var BRACKET_ANGLE_RIGHT = 7;
var HALF_SQUARE_LEFT = 8; var HALF_SQUARE_LEFT = 8;
var HALF_SQUARE_RIGHT = 9; var HALF_SQUARE_RIGHT = 9;
var HALF_SQUARE_LEFT_LOWER = 10; var HALF_SQUARE_LEFT_UPPER = 10;
var HALF_SQUARE_RIGHT_LOWER = 11; var HALF_SQUARE_RIGHT_UPPER = 11;
var HALF_SQUARE_LEFT_UPPER = 12; var DELIMITER_LINE = 12;
var HALF_SQUARE_RIGHT_UPPER = 13; var DELIMITER_DOUBLE_LINE = 13;
var DELIMITER_LINE = 14; var WHITE_SQUARE_LEFT = 14;
var DELIMITER_DOUBLE_LINE = 15; var WHITE_SQUARE_RIGHT = 15;
var DELIMITER_LOCATION_TOP = 0; var DELIMITER_LOCATION_TOP = 0;
var DELIMITER_LOCATION_BOTTOM = 1; var DELIMITER_LOCATION_BOTTOM = 1;
var DELIMITER_LOCATION_LEFT = 2; var DELIMITER_LOCATION_LEFT = 2;
var DELIMITER_LOCATION_RIGHT = 2; var DELIMITER_LOCATION_RIGHT = 3;
var DELIMITER_TURN_0 = 0; var DELIMITER_TURN_0 = 0;
var DELIMITER_TURN_180 = 1; var DELIMITER_TURN_180 = 1;
var DELIMITER_TURN_MIRROR_0 = 2; var DELIMITER_TURN_MIRROR_0 = 2;
......
Word/Math/operators.js
View file @ c90b84ff
This diff is collapsed.
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