Skip to content

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

git-svn-id:... 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49352 954022d7-b5bf-4e40-9824-e11837661b57
parent 41b71a23
Show whitespace changes
Inline Side-by-side
Showing with 412 additions and 167 deletions
Word/Math/mathContent.js
View file @ b2f53207
...@@ -2477,7 +2477,7 @@ CMathContent.prototype = ...@@ -2477,7 +2477,7 @@ CMathContent.prototype =
break; break;
case 23: case 23:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_INTEGRAL, signType: NARY_INTEGRAL,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2489,7 +2489,7 @@ CMathContent.prototype = ...@@ -2489,7 +2489,7 @@ CMathContent.prototype =
break; break;
case 24: case 24:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_INTEGRAL, signType: NARY_INTEGRAL,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -2499,7 +2499,7 @@ CMathContent.prototype = ...@@ -2499,7 +2499,7 @@ CMathContent.prototype =
break; break;
case 25: case 25:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_INTEGRAL, signType: NARY_INTEGRAL,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -2509,7 +2509,7 @@ CMathContent.prototype = ...@@ -2509,7 +2509,7 @@ CMathContent.prototype =
break; break;
case 26: case 26:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_DOUBLE_INTEGRAL, signType: NARY_DOUBLE_INTEGRAL,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2521,7 +2521,7 @@ CMathContent.prototype = ...@@ -2521,7 +2521,7 @@ CMathContent.prototype =
break; break;
case 27: case 27:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_DOUBLE_INTEGRAL, signType: NARY_DOUBLE_INTEGRAL,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -2531,7 +2531,7 @@ CMathContent.prototype = ...@@ -2531,7 +2531,7 @@ CMathContent.prototype =
break; break;
case 28: case 28:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_DOUBLE_INTEGRAL, signType: NARY_DOUBLE_INTEGRAL,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -2541,7 +2541,7 @@ CMathContent.prototype = ...@@ -2541,7 +2541,7 @@ CMathContent.prototype =
break; break;
case 29: case 29:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_TRIPLE_INTEGRAL, signType: NARY_TRIPLE_INTEGRAL,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2553,7 +2553,7 @@ CMathContent.prototype = ...@@ -2553,7 +2553,7 @@ CMathContent.prototype =
break; break;
case 30: case 30:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_TRIPLE_INTEGRAL, signType: NARY_TRIPLE_INTEGRAL,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -2563,7 +2563,7 @@ CMathContent.prototype = ...@@ -2563,7 +2563,7 @@ CMathContent.prototype =
break; break;
case 31: case 31:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_TRIPLE_INTEGRAL, signType: NARY_TRIPLE_INTEGRAL,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -2573,7 +2573,7 @@ CMathContent.prototype = ...@@ -2573,7 +2573,7 @@ CMathContent.prototype =
break; break;
case 32: case 32:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_CONTOUR_INTEGRAL, signType: NARY_CONTOUR_INTEGRAL,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2585,7 +2585,7 @@ CMathContent.prototype = ...@@ -2585,7 +2585,7 @@ CMathContent.prototype =
break; break;
case 33: case 33:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_CONTOUR_INTEGRAL, signType: NARY_CONTOUR_INTEGRAL,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -2595,7 +2595,7 @@ CMathContent.prototype = ...@@ -2595,7 +2595,7 @@ CMathContent.prototype =
break; break;
case 34: case 34:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_CONTOUR_INTEGRAL, signType: NARY_CONTOUR_INTEGRAL,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -2605,7 +2605,7 @@ CMathContent.prototype = ...@@ -2605,7 +2605,7 @@ CMathContent.prototype =
break; break;
case 35: case 35:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_SURFACE_INTEGRAL, signType: NARY_SURFACE_INTEGRAL,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2617,7 +2617,7 @@ CMathContent.prototype = ...@@ -2617,7 +2617,7 @@ CMathContent.prototype =
break; break;
case 36: case 36:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_SURFACE_INTEGRAL, signType: NARY_SURFACE_INTEGRAL,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -2627,7 +2627,7 @@ CMathContent.prototype = ...@@ -2627,7 +2627,7 @@ CMathContent.prototype =
break; break;
case 37: case 37:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_SURFACE_INTEGRAL, signType: NARY_SURFACE_INTEGRAL,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -2637,7 +2637,7 @@ CMathContent.prototype = ...@@ -2637,7 +2637,7 @@ CMathContent.prototype =
break; break;
case 38: case 38:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_VOLUME_INTEGRAL, signType: NARY_VOLUME_INTEGRAL,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2649,7 +2649,7 @@ CMathContent.prototype = ...@@ -2649,7 +2649,7 @@ CMathContent.prototype =
break; break;
case 39: case 39:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_VOLUME_INTEGRAL, signType: NARY_VOLUME_INTEGRAL,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -2659,7 +2659,7 @@ CMathContent.prototype = ...@@ -2659,7 +2659,7 @@ CMathContent.prototype =
break; break;
case 40: case 40:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_VOLUME_INTEGRAL, signType: NARY_VOLUME_INTEGRAL,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -2702,7 +2702,7 @@ CMathContent.prototype = ...@@ -2702,7 +2702,7 @@ CMathContent.prototype =
break; break;
case 44: case 44:
var integr = this.addMComponent(MATH_NARY); var integr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_SIGMA, signType: NARY_SIGMA,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2714,7 +2714,7 @@ CMathContent.prototype = ...@@ -2714,7 +2714,7 @@ CMathContent.prototype =
break; break;
case 45: case 45:
var sigma = this.addMComponent(MATH_NARY); var sigma = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_SIGMA, signType: NARY_SIGMA,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -2724,7 +2724,7 @@ CMathContent.prototype = ...@@ -2724,7 +2724,7 @@ CMathContent.prototype =
break; break;
case 46: case 46:
var sigma = this.addMComponent(MATH_NARY); var sigma = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_SIGMA, signType: NARY_SIGMA,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -2734,7 +2734,7 @@ CMathContent.prototype = ...@@ -2734,7 +2734,7 @@ CMathContent.prototype =
break; break;
case 47: case 47:
var sigma = this.addMComponent(MATH_NARY); var sigma = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_SIGMA, signType: NARY_SIGMA,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2745,7 +2745,7 @@ CMathContent.prototype = ...@@ -2745,7 +2745,7 @@ CMathContent.prototype =
break; break;
case 48: case 48:
var sigma = this.addMComponent(MATH_NARY); var sigma = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_SIGMA, signType: NARY_SIGMA,
limLocType: NARY_SubSup, limLocType: NARY_SubSup,
...@@ -2756,7 +2756,7 @@ CMathContent.prototype = ...@@ -2756,7 +2756,7 @@ CMathContent.prototype =
break; break;
case 49: case 49:
var product = this.addMComponent(MATH_NARY); var product = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_PRODUCT, signType: NARY_PRODUCT,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2768,7 +2768,7 @@ CMathContent.prototype = ...@@ -2768,7 +2768,7 @@ CMathContent.prototype =
break; break;
case 50: case 50:
var product = this.addMComponent(MATH_NARY); var product = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_PRODUCT, signType: NARY_PRODUCT,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -2778,7 +2778,7 @@ CMathContent.prototype = ...@@ -2778,7 +2778,7 @@ CMathContent.prototype =
break; break;
case 51: case 51:
var product = this.addMComponent(MATH_NARY); var product = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_PRODUCT, signType: NARY_PRODUCT,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -2788,7 +2788,7 @@ CMathContent.prototype = ...@@ -2788,7 +2788,7 @@ CMathContent.prototype =
break; break;
case 52: case 52:
var product = this.addMComponent(MATH_NARY); var product = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_PRODUCT, signType: NARY_PRODUCT,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2799,7 +2799,7 @@ CMathContent.prototype = ...@@ -2799,7 +2799,7 @@ CMathContent.prototype =
break; break;
case 53: case 53:
var product = this.addMComponent(MATH_NARY); var product = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_PRODUCT, signType: NARY_PRODUCT,
limLocType: NARY_SubSup, limLocType: NARY_SubSup,
...@@ -2810,7 +2810,7 @@ CMathContent.prototype = ...@@ -2810,7 +2810,7 @@ CMathContent.prototype =
break; break;
case 54: case 54:
var coproduct = this.addMComponent(MATH_NARY); var coproduct = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_COPRODUCT, signType: NARY_COPRODUCT,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2822,7 +2822,7 @@ CMathContent.prototype = ...@@ -2822,7 +2822,7 @@ CMathContent.prototype =
break; break;
case 55: case 55:
var coproduct = this.addMComponent(MATH_NARY); var coproduct = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_COPRODUCT, signType: NARY_COPRODUCT,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -2832,7 +2832,7 @@ CMathContent.prototype = ...@@ -2832,7 +2832,7 @@ CMathContent.prototype =
break; break;
case 56: case 56:
var coproduct = this.addMComponent(MATH_NARY); var coproduct = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_COPRODUCT, signType: NARY_COPRODUCT,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -2842,7 +2842,7 @@ CMathContent.prototype = ...@@ -2842,7 +2842,7 @@ CMathContent.prototype =
break; break;
case 57: case 57:
var coproduct = this.addMComponent(MATH_NARY); var coproduct = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_COPRODUCT, signType: NARY_COPRODUCT,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2853,7 +2853,7 @@ CMathContent.prototype = ...@@ -2853,7 +2853,7 @@ CMathContent.prototype =
break; break;
case 58: case 58:
var coproduct = this.addMComponent(MATH_NARY); var coproduct = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_COPRODUCT, signType: NARY_COPRODUCT,
limLocType: NARY_SubSup, limLocType: NARY_SubSup,
...@@ -2865,7 +2865,7 @@ CMathContent.prototype = ...@@ -2865,7 +2865,7 @@ CMathContent.prototype =
case 59: case 59:
var union = this.addMComponent(MATH_NARY); var union = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_UNION, signType: NARY_UNION,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2877,7 +2877,7 @@ CMathContent.prototype = ...@@ -2877,7 +2877,7 @@ CMathContent.prototype =
break; break;
case 60: case 60:
var union = this.addMComponent(MATH_NARY); var union = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_UNION, signType: NARY_UNION,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -2887,7 +2887,7 @@ CMathContent.prototype = ...@@ -2887,7 +2887,7 @@ CMathContent.prototype =
break; break;
case 61: case 61:
var union = this.addMComponent(MATH_NARY); var union = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_UNION, signType: NARY_UNION,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -2897,7 +2897,7 @@ CMathContent.prototype = ...@@ -2897,7 +2897,7 @@ CMathContent.prototype =
break; break;
case 62: case 62:
var union = this.addMComponent(MATH_NARY); var union = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_UNION, signType: NARY_UNION,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2908,7 +2908,7 @@ CMathContent.prototype = ...@@ -2908,7 +2908,7 @@ CMathContent.prototype =
break; break;
case 63: case 63:
var union = this.addMComponent(MATH_NARY); var union = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_UNION, signType: NARY_UNION,
limLocType: NARY_SubSup, limLocType: NARY_SubSup,
...@@ -2920,7 +2920,7 @@ CMathContent.prototype = ...@@ -2920,7 +2920,7 @@ CMathContent.prototype =
case 64: case 64:
var intersection = this.addMComponent(MATH_NARY); var intersection = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_INTERSECTION, signType: NARY_INTERSECTION,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2932,7 +2932,7 @@ CMathContent.prototype = ...@@ -2932,7 +2932,7 @@ CMathContent.prototype =
break; break;
case 65: case 65:
var intersection = this.addMComponent(MATH_NARY); var intersection = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_INTERSECTION, signType: NARY_INTERSECTION,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -2942,7 +2942,7 @@ CMathContent.prototype = ...@@ -2942,7 +2942,7 @@ CMathContent.prototype =
break; break;
case 66: case 66:
var intersection = this.addMComponent(MATH_NARY); var intersection = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_INTERSECTION, signType: NARY_INTERSECTION,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -2952,7 +2952,7 @@ CMathContent.prototype = ...@@ -2952,7 +2952,7 @@ CMathContent.prototype =
break; break;
case 67: case 67:
var intersection = this.addMComponent(MATH_NARY); var intersection = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_INTERSECTION, signType: NARY_INTERSECTION,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2963,7 +2963,7 @@ CMathContent.prototype = ...@@ -2963,7 +2963,7 @@ CMathContent.prototype =
break; break;
case 68: case 68:
var intersection = this.addMComponent(MATH_NARY); var intersection = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_INTERSECTION, signType: NARY_INTERSECTION,
limLocType: NARY_SubSup, limLocType: NARY_SubSup,
...@@ -2975,7 +2975,7 @@ CMathContent.prototype = ...@@ -2975,7 +2975,7 @@ CMathContent.prototype =
case 69: case 69:
var logicalOr = this.addMComponent(MATH_NARY); var logicalOr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_LOGICAL_OR, signType: NARY_LOGICAL_OR,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -2987,7 +2987,7 @@ CMathContent.prototype = ...@@ -2987,7 +2987,7 @@ CMathContent.prototype =
break; break;
case 70: case 70:
var logicalOr = this.addMComponent(MATH_NARY); var logicalOr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_LOGICAL_OR, signType: NARY_LOGICAL_OR,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -2997,7 +2997,7 @@ CMathContent.prototype = ...@@ -2997,7 +2997,7 @@ CMathContent.prototype =
break; break;
case 71: case 71:
var logicalOr = this.addMComponent(MATH_NARY); var logicalOr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_LOGICAL_OR, signType: NARY_LOGICAL_OR,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -3007,7 +3007,7 @@ CMathContent.prototype = ...@@ -3007,7 +3007,7 @@ CMathContent.prototype =
break; break;
case 72: case 72:
var logicalOr = this.addMComponent(MATH_NARY); var logicalOr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_LOGICAL_OR, signType: NARY_LOGICAL_OR,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -3018,7 +3018,7 @@ CMathContent.prototype = ...@@ -3018,7 +3018,7 @@ CMathContent.prototype =
break; break;
case 73: case 73:
var logicalOr = this.addMComponent(MATH_NARY); var logicalOr = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_LOGICAL_OR, signType: NARY_LOGICAL_OR,
limLocType: NARY_SubSup, limLocType: NARY_SubSup,
...@@ -3030,7 +3030,7 @@ CMathContent.prototype = ...@@ -3030,7 +3030,7 @@ CMathContent.prototype =
case 74: case 74:
var logicalAnd = this.addMComponent(MATH_NARY); var logicalAnd = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_LOGICAL_AND, signType: NARY_LOGICAL_AND,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -3042,7 +3042,7 @@ CMathContent.prototype = ...@@ -3042,7 +3042,7 @@ CMathContent.prototype =
break; break;
case 75: case 75:
var logicalAnd = this.addMComponent(MATH_NARY); var logicalAnd = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_LOGICAL_AND, signType: NARY_LOGICAL_AND,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -3052,7 +3052,7 @@ CMathContent.prototype = ...@@ -3052,7 +3052,7 @@ CMathContent.prototype =
break; break;
case 76: case 76:
var logicalAnd = this.addMComponent(MATH_NARY); var logicalAnd = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_LOGICAL_AND, signType: NARY_LOGICAL_AND,
limLocType: NARY_SubSup limLocType: NARY_SubSup
...@@ -3062,7 +3062,7 @@ CMathContent.prototype = ...@@ -3062,7 +3062,7 @@ CMathContent.prototype =
break; break;
case 77: case 77:
var logicalAnd = this.addMComponent(MATH_NARY); var logicalAnd = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_LOGICAL_AND, signType: NARY_LOGICAL_AND,
limLocType: NARY_UndOvr, limLocType: NARY_UndOvr,
...@@ -3073,7 +3073,7 @@ CMathContent.prototype = ...@@ -3073,7 +3073,7 @@ CMathContent.prototype =
break; break;
case 78: case 78:
var logicalAnd = this.addMComponent(MATH_NARY); var logicalAnd = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_LOGICAL_AND, signType: NARY_LOGICAL_AND,
limLocType: NARY_SubSup, limLocType: NARY_SubSup,
...@@ -3101,7 +3101,7 @@ CMathContent.prototype = ...@@ -3101,7 +3101,7 @@ CMathContent.prototype =
case 80: case 80:
var sigma = this.addMComponent(MATH_NARY); var sigma = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_SIGMA, signType: NARY_SIGMA,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -3117,7 +3117,7 @@ CMathContent.prototype = ...@@ -3117,7 +3117,7 @@ CMathContent.prototype =
break; break;
case 81: case 81:
var product = this.addMComponent(MATH_NARY); var product = this.addMComponent(MATH_NARY);
props = var props =
{ {
signType: NARY_PRODUCT, signType: NARY_PRODUCT,
limLocType: NARY_UndOvr limLocType: NARY_UndOvr
...@@ -3173,9 +3173,18 @@ CMathContent.prototype = ...@@ -3173,9 +3173,18 @@ CMathContent.prototype =
break; break;
case 84: case 84:
var delim = this.addMComponent(9); var delim = this.addMComponent(MATH_DELIMITER);
delim.init(0, 4, 0, 1); var props =
{
begChr: {type: PARENTHESIS_LEFT},
endChr: {type: PARENTHESIS_RIGHT},
column: 1
};
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(9);
...@@ -3446,16 +3455,13 @@ CMathContent.prototype = ...@@ -3446,16 +3455,13 @@ CMathContent.prototype =
var arg = trig.getArgument(); var arg = trig.getArgument();
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 131: case 131:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
var degr = func.addMComponent(3); var degr = func.addMComponent(MATH_DEGREE);
degr.init(); degr.init({type: DEGREE_SUPERSCRIPT});
degr.setIndex(1);
var base = degr.getBase(); var base = degr.getBase();
base.setOwnTPrp({Italic: false});
base.addTxt("sin"); base.addTxt("sin");
var iter = degr.getIterator(); var iter = degr.getIterator();
iter.addTxt("-1"); iter.addTxt("-1");
...@@ -3463,14 +3469,12 @@ CMathContent.prototype = ...@@ -3463,14 +3469,12 @@ CMathContent.prototype =
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 132: case 132:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
var degr = func.addMComponent(3); var degr = func.addMComponent(MATH_DEGREE);
degr.init(); degr.init({type: DEGREE_SUPERSCRIPT});
degr.setIndex(1);
var base = degr.getBase(); var base = degr.getBase();
base.setOwnTPrp({Italic: false});
base.addTxt("cos"); base.addTxt("cos");
var iter = degr.getIterator(); var iter = degr.getIterator();
iter.addTxt("-1"); iter.addTxt("-1");
...@@ -3478,14 +3482,12 @@ CMathContent.prototype = ...@@ -3478,14 +3482,12 @@ CMathContent.prototype =
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 133: case 133:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
var degr = func.addMComponent(3); var degr = func.addMComponent(MATH_DEGREE);
degr.init(); degr.init({type: DEGREE_SUPERSCRIPT});
degr.setIndex(1);
var base = degr.getBase(); var base = degr.getBase();
base.setOwnTPrp({Italic: false});
base.addTxt("tan"); base.addTxt("tan");
var iter = degr.getIterator(); var iter = degr.getIterator();
iter.addTxt("-1"); iter.addTxt("-1");
...@@ -3493,14 +3495,12 @@ CMathContent.prototype = ...@@ -3493,14 +3495,12 @@ CMathContent.prototype =
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 134: case 134:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
var degr = func.addMComponent(3); var degr = func.addMComponent(MATH_DEGREE);
degr.init(); degr.init({type: DEGREE_SUPERSCRIPT});
degr.setIndex(1);
var base = degr.getBase(); var base = degr.getBase();
base.setOwnTPrp({Italic: false});
base.addTxt("csc"); base.addTxt("csc");
var iter = degr.getIterator(); var iter = degr.getIterator();
iter.addTxt("-1"); iter.addTxt("-1");
...@@ -3508,14 +3508,12 @@ CMathContent.prototype = ...@@ -3508,14 +3508,12 @@ CMathContent.prototype =
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 135: case 135:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
var degr = func.addMComponent(3); var degr = func.addMComponent(MATH_DEGREE);
degr.init(); degr.init({type: DEGREE_SUPERSCRIPT});
degr.setIndex(1);
var base = degr.getBase(); var base = degr.getBase();
base.setOwnTPrp({Italic: false});
base.addTxt("sec"); base.addTxt("sec");
var iter = degr.getIterator(); var iter = degr.getIterator();
iter.addTxt("-1"); iter.addTxt("-1");
...@@ -3523,14 +3521,12 @@ CMathContent.prototype = ...@@ -3523,14 +3521,12 @@ CMathContent.prototype =
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 136: case 136:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
var degr = func.addMComponent(3); var degr = func.addMComponent(MATH_DEGREE);
degr.init(); degr.init({type: DEGREE_SUPERSCRIPT});
degr.setIndex(1);
var base = degr.getBase(); var base = degr.getBase();
base.setOwnTPrp({Italic: false});
base.addTxt("cot"); base.addTxt("cot");
var iter = degr.getIterator(); var iter = degr.getIterator();
iter.addTxt("-1"); iter.addTxt("-1");
...@@ -3539,63 +3535,61 @@ CMathContent.prototype = ...@@ -3539,63 +3535,61 @@ CMathContent.prototype =
break; break;
case 137: case 137:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
func.addTxt("sinh"); func.addTxt("sinh");
var arg = trig.getArgument(); var arg = trig.getArgument();
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 138: case 138:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
func.addTxt("cosh"); func.addTxt("cosh");
var arg = trig.getArgument(); var arg = trig.getArgument();
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 139: case 139:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
func.addTxt("tanh"); func.addTxt("tanh");
var arg = trig.getArgument(); var arg = trig.getArgument();
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 140: case 140:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
func.addTxt("csch"); func.addTxt("csch");
var arg = trig.getArgument(); var arg = trig.getArgument();
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 141: case 141:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
func.addTxt("sech"); func.addTxt("sech");
var arg = trig.getArgument(); var arg = trig.getArgument();
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 142: case 142:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
func.addTxt("coth"); func.addTxt("coth");
var arg = trig.getArgument(); var arg = trig.getArgument();
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 143: case 143:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
var degr = func.addMComponent(3); var degr = func.addMComponent(MATH_DEGREE);
degr.init(); degr.init({type: DEGREE_SUPERSCRIPT});
degr.setIndex(1);
var base = degr.getBase(); var base = degr.getBase();
base.setOwnTPrp({Italic: false});
base.addTxt("sinh"); base.addTxt("sinh");
var iter = degr.getIterator(); var iter = degr.getIterator();
iter.addTxt("-1"); iter.addTxt("-1");
...@@ -3603,14 +3597,12 @@ CMathContent.prototype = ...@@ -3603,14 +3597,12 @@ CMathContent.prototype =
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 144: case 144:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
var degr = func.addMComponent(3); var degr = func.addMComponent(MATH_DEGREE);
degr.init(); degr.init({type: DEGREE_SUPERSCRIPT});
degr.setIndex(1);
var base = degr.getBase(); var base = degr.getBase();
base.setOwnTPrp({Italic: false});
base.addTxt("cosh"); base.addTxt("cosh");
var iter = degr.getIterator(); var iter = degr.getIterator();
iter.addTxt("-1"); iter.addTxt("-1");
...@@ -3618,14 +3610,12 @@ CMathContent.prototype = ...@@ -3618,14 +3610,12 @@ CMathContent.prototype =
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 145: case 145:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
var degr = func.addMComponent(3); var degr = func.addMComponent(MATH_DEGREE);
degr.init(); degr.init({type: DEGREE_SUPERSCRIPT});
degr.setIndex(1);
var base = degr.getBase(); var base = degr.getBase();
base.setOwnTPrp({Italic: false});
base.addTxt("tanh"); base.addTxt("tanh");
var iter = degr.getIterator(); var iter = degr.getIterator();
iter.addTxt("-1"); iter.addTxt("-1");
...@@ -3633,14 +3623,12 @@ CMathContent.prototype = ...@@ -3633,14 +3623,12 @@ CMathContent.prototype =
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 146: case 146:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
var degr = func.addMComponent(3); var degr = func.addMComponent(MATH_DEGREE);
degr.init(); degr.init({type: DEGREE_SUPERSCRIPT});
degr.setIndex(1);
var base = degr.getBase(); var base = degr.getBase();
base.setOwnTPrp({Italic: false});
base.addTxt("csch"); base.addTxt("csch");
var iter = degr.getIterator(); var iter = degr.getIterator();
iter.addTxt("-1"); iter.addTxt("-1");
...@@ -3648,14 +3636,12 @@ CMathContent.prototype = ...@@ -3648,14 +3636,12 @@ CMathContent.prototype =
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 147: case 147:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
var degr = func.addMComponent(3); var degr = func.addMComponent(MATH_DEGREE);
degr.init(); degr.init({type: DEGREE_SUPERSCRIPT});
degr.setIndex(1);
var base = degr.getBase(); var base = degr.getBase();
base.setOwnTPrp({Italic: false});
base.addTxt("sech"); base.addTxt("sech");
var iter = degr.getIterator(); var iter = degr.getIterator();
iter.addTxt("-1"); iter.addTxt("-1");
...@@ -3663,14 +3649,12 @@ CMathContent.prototype = ...@@ -3663,14 +3649,12 @@ CMathContent.prototype =
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 148: case 148:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
var degr = func.addMComponent(3); var degr = func.addMComponent(MATH_DEGREE);
degr.init(); degr.init({type: DEGREE_SUPERSCRIPT});
degr.setIndex(1);
var base = degr.getBase(); var base = degr.getBase();
base.setOwnTPrp({Italic: false});
base.addTxt("coth"); base.addTxt("coth");
var iter = degr.getIterator(); var iter = degr.getIterator();
iter.addTxt("-1"); iter.addTxt("-1");
...@@ -3678,41 +3662,45 @@ CMathContent.prototype = ...@@ -3678,41 +3662,45 @@ CMathContent.prototype =
arg.fillPlaceholders(); arg.fillPlaceholders();
break; break;
case 149: case 149:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
func.addTxt("sin"); func.addTxt("sin");
var arg = trig.getArgument(); var arg = trig.getArgument();
arg.addTxt("θ"); arg.addTxt("θ");
break; break;
case 150: case 150:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
func.addTxt("cos"); func.addTxt("cos");
var arg = trig.getArgument(); var arg = trig.getArgument();
arg.addTxt("2x"); arg.addTxt("2x");
break; break;
case 151: case 151:
var trig = this.addMComponent(11); var trig = this.addMComponent(MATH_FUNCTION);
trig.init(); trig.init();
var func = trig.getFunction(); var func = trig.getFName();
func.addTxt("tan"); func.addTxt("tan");
var arg = trig.getArgument(); var arg = trig.getArgument();
arg.addTxt("θ"); arg.addTxt("θ");
this.addTxt("="); this.addTxt("=");
var fract = this.addMComponent(0); var fract = this.addMComponent(MATH_FRACTION);
fract.init(); fract.init({type: BAR_FRACTION});
var num = fract.getNumerator(); var num = fract.getNumerator();
var sin = num.addMComponent(11); var sin = num.addMComponent(MATH_FUNCTION);
sin.init(); sin.init();
sin.getFunction().addTxt("sin"); var func1 = sin.getFName();
sin.getArgument().addTxt("θ"); func1.addTxt("sin");
var arg1 = sin.getArgument();
arg1.addTxt("θ");
var den = fract.getDenominator(); var den = fract.getDenominator();
var cos = den.addMComponent(11); var cos = den.addMComponent(MATH_FUNCTION);
cos.init(); cos.init();
cos.getFunction().addTxt("cos"); var func2 = cos.getFName();
cos.getArgument().addTxt("θ"); func2.addTxt("cos");
var arg2 = cos.getArgument();
arg2.addTxt("θ");
break; break;
case 152: case 152:
var diac = this.addMComponent(15); var diac = this.addMComponent(15);
...@@ -5191,7 +5179,7 @@ CMathContent.prototype = ...@@ -5191,7 +5179,7 @@ CMathContent.prototype =
{ {
bDelete: false, /* нужно ли пересчитывать позицию или нет, работает при backspace */ bDelete: false, /* нужно ли пересчитывать позицию или нет, работает при backspace */
bBeging: false, /* в начале контента или нет */ bBeging: false, /* в начале контента или нет */
bEnd: false, /* в конце */ bEnd: false /* в конце */
}; };
var CurrContent = SelectContent = null, var CurrContent = SelectContent = null,
......
Word/Math/operators.js
View file @ b2f53207
...@@ -12,7 +12,7 @@ function CGlyphOperator() ...@@ -12,7 +12,7 @@ function CGlyphOperator()
this.TxtPrp = new CMathTextPrp(); this.TxtPrp = new CMathTextPrp();
} }
CGlyphOperator.prototype.setLocation = function(loc, turn) /*CGlyphOperator.prototype.setLocation = function(loc, turn)
{ {
// location // location
...@@ -30,13 +30,32 @@ CGlyphOperator.prototype.setLocation = function(loc, turn) ...@@ -30,13 +30,32 @@ CGlyphOperator.prototype.setLocation = function(loc, turn)
this.loc = loc; this.loc = loc;
this.turn = turn; this.turn = turn;
}*/
CGlyphOperator.prototype.init = function(props)
{
// location
// 0 - up
// 1 - down
// 2 - left
// 3 - right
// turn
// 0 - 0
// 1 - Pi
// 2 - Pi/2
// 3 - 3*Pi/2
this.loc = props.location;
this.turn = props.turn;
} }
CGlyphOperator.prototype.setPosition = function(pos) CGlyphOperator.prototype.setPosition = function(pos)
{ {
this.pos = pos; this.pos = pos;
//this.pos = {x: pos.x, y : pos.y - this.size.center}; //this.pos = {x: pos.x, y : pos.y - this.size.center};
} }
CGlyphOperator.prototype.recalculateSize = function(measure) CGlyphOperator.prototype.fixSize = function(measure)
{ {
var sizeGlyph = this.calcSize(measure); var sizeGlyph = this.calcSize(measure);
var width, height, center; var width, height, center;
...@@ -287,7 +306,7 @@ CGlyphOperator.prototype.relate = function(parent) ...@@ -287,7 +306,7 @@ CGlyphOperator.prototype.relate = function(parent)
} }
CGlyphOperator.prototype.Resize = function() CGlyphOperator.prototype.Resize = function()
{ {
this.recalculateSize(); this.fixSize(); //??
} }
CGlyphOperator.prototype.getTxtPrp = function() CGlyphOperator.prototype.getTxtPrp = function()
{ {
...@@ -573,6 +592,101 @@ old_CDelimiter.prototype.Resize = function() ...@@ -573,6 +592,101 @@ old_CDelimiter.prototype.Resize = function()
this.recalculateSize(); this.recalculateSize();
} }
function GetOperator(chr)
{
var operator;
if(chr == null || typeof(chr) == "undefined")
operator = -1;
else if( chr.value === "(" || chr.type === PARENTHESIS_LEFT)
{
operator = new COperatorParenthesis();
var props =
{
location: DELIMITER_LOCATION_LEFT,
turn: DELIMITER_TURN_0
};
operator.init(props);
}
else if( chr.value === ")" || chr.type === PARENTHESIS_RIGHT)
{
operator = new COperatorParenthesis();
var props =
{
location: DELIMITER_LOCATION_RIGHT,
turn: DELIMITER_TURN_180
};
operator.init(props);
}
else if( chr.value == "{" || chr.type === BRACKET_CURLY_LEFT)
{
operator = new COperatorBracket();
var props =
{
location: DELIMITER_LOCATION_LEFT,
turn: DELIMITER_TURN_0
};
operator.init(props);
}
else if( chr.value === "}" || chr.type === BRACKET_CURLY_RIGHT)
{
operator = new COperatorBracket();
var props =
{
location: DELIMITER_LOCATION_RIGHT,
turn: DELIMITER_TURN_180
};
operator.init(props);
}
else if( chr.value === "[" || chr.type === BRACKET_SQUARE_LEFT)
{
operator = new CSquareBracket();
var props =
{
location: DELIMITER_LOCATION_LEFT,
turn: DELIMITER_TURN_0
};
operator.init(props);
}
else if( chr.value === "]" || chr.type === BRACKET_SQUARE_RIGHT)
{
operator = new CSquareBracket();
var props =
{
location: DELIMITER_LOCATION_RIGHT,
turn: DELIMITER_TURN_180
};
operator.init(props);
}
else if( chr.value === "<" || chr.type === BRACKET_SQUARE_LEFT)
{
operator = new CSquareBracket();
var props =
{
location: DELIMITER_LOCATION_LEFT,
turn: DELIMITER_TURN_0
};
operator.init(props);
}
else if( chr.value === ">" || chr.type === BRACKET_SQUARE_RIGHT)
{
operator = new CSquareBracket();
var props =
{
location: DELIMITER_LOCATION_RIGHT,
turn: DELIMITER_TURN_180
};
operator.init(props);
}
else if( chr.value === "" || chr.type === BRACKET_EMPTY)
operator = -1;
else
operator = -1;
return operator;
}
function CBaseDelimiter() function CBaseDelimiter()
{ {
// location // location
...@@ -3234,13 +3348,13 @@ old_CSeparatorDelimiter.prototype.mouseMove = function(mCoord) ...@@ -3234,13 +3348,13 @@ old_CSeparatorDelimiter.prototype.mouseMove = function(mCoord)
} }
function CSeparator() function old_CSeparator()
{ {
this.sepChr = 0x7C; // default this.sepChr = 0x7C; // default
CMathBase.call(this); CMathBase.call(this);
} }
extend(CSeparator, CMathBase); extend(old_CSeparator, CMathBase);
CSeparator.prototype.init = function(sepChr, column) old_CSeparator.prototype.init = function(sepChr, column)
{ {
if(sepChr !== "undefined" && sepChr !== null) if(sepChr !== "undefined" && sepChr !== null)
this.sepChr = sepChr.charCodeAt(0); this.sepChr = sepChr.charCodeAt(0);
...@@ -3248,17 +3362,17 @@ CSeparator.prototype.init = function(sepChr, column) ...@@ -3248,17 +3362,17 @@ CSeparator.prototype.init = function(sepChr, column)
this.setDimension(1, column); this.setDimension(1, column);
this.setContent(); this.setContent();
} }
CSeparator.prototype.setDistance = function() old_CSeparator.prototype.setDistance = function()
{ {
this.dW = this.getTxtPrp().FontSize/3*g_dKoef_pt_to_mm; this.dW = this.getTxtPrp().FontSize/3*g_dKoef_pt_to_mm;
} }
CSeparator.prototype.draw = function() old_CSeparator.prototype.draw = function()
{ {
//if(this.sepChr == ) //if(this.sepChr == )
CSeparator.superclass.draw.call(this); old_CSeparator.superclass.draw.call(this);
} }
CSeparator.prototype.drawHorLine = function() old_CSeparator.prototype.drawHorLine = function()
{ {
var x = this.pos.x, var x = this.pos.x,
y = this.pos.y; y = this.pos.y;
...@@ -3295,12 +3409,21 @@ CSeparator.prototype.drawHorLine = function() ...@@ -3295,12 +3409,21 @@ CSeparator.prototype.drawHorLine = function()
MathControl.pGraph.SetIntegerGrid(intGrid); MathControl.pGraph.SetIntegerGrid(intGrid);
} }
function CSeparator()
{
}
extend(CSeparator, CMathBase);
function CDelimiter() function CDelimiter()
{ {
this.begOper = null; this.begOper = null;
this.endOper = null; this.endOper = null;
this.sepOper = null; this.sepOper = null;
this.shape = null; this.shape = null;
CSubMathBase.call(this);
} }
extend(CDelimiter, CSubMathBase); extend(CDelimiter, CSubMathBase);
CDelimiter.prototype.init = function(props) CDelimiter.prototype.init = function(props)
...@@ -3321,6 +3444,140 @@ CDelimiter.prototype.init = function(props) ...@@ -3321,6 +3444,140 @@ CDelimiter.prototype.init = function(props)
this.shape = DELIMITER_SHAPE_MATH; this.shape = DELIMITER_SHAPE_MATH;
else if(props.shape == "centered") else if(props.shape == "centered")
this.shape = DELIMITER_SHAPE_CENTERED; this.shape = DELIMITER_SHAPE_CENTERED;
else
this.shape = DELIMITER_SHAPE_CENTERED;
this.setDimension(1, props.column);
this.setContent();
}
CDelimiter.prototype.recalculateSize = function()
{
var height = 0,
width = 0, center = 0;
if(this.shape == DELIMITER_SHAPE_CENTERED)
{
var ascent = 0,
descent = 0;
for(var j = 0; j < this.nCol; j++)
{
var content = this.elements[0][j].size;
width += content.width;
ascent = content.center > ascent ? content.center : ascent;
descent = content.height - content.center > descent ? content.height - content.center : descent;
}
height = ascent > descent ? 2*ascent : 2*descent;
center = height/2;
}
else
{
for(var j = 0; j < this.nCol; j++)
{
var content = this.elements[0][j].size;
width += content.width;
center = content.center > center ? content.center : center;
height = content.height > height ? content.height : height;
}
}
if(this.begOper !== -1)
{
this.begOper.fixSize(height);
width += this.begOper.size.width;
}
if(this.endOper !== -1)
{
this.endOper.fixSize(height);
width += this.endOper.size.width;
}
if(this.sepOper !== -1)
{
this.sepOper.fixSize(height);
width += (this.nCol - 1)*this.sepOper.size.width;
}
this.size = {width: width, height: height, center: center};
}
CDelimiter.prototype.align = function(element)
{
var align = 0;
if(this.size.height > element.size.height)
{
if(this.shape == DELIMITER_SHAPE_CENTERED)
align = this.size.center - element.size.center;
else if(this.shape == DELIMITER_SHAPE_MATH)
{
var ascent = this.size.center,
descent = this.size.height - this.size.center;
var k = ascent/descent;
if(k < 0.2)
k = 0.2;
else if(k > 0.8)
k = 0.8;
align = ascent - element.size.height/2 * k;
}
}
return align;
}
CDelimiter.prototype.setPosition = function(pos)
{
this.pos = {x: pos.x, y: pos.y - this.size.center};
/*if(this.begOper !== -1)
{
var position = { x: this.pos.x, y: this.pos.y + this.align(this.begOper) };
this.begOper.setPosition(position);
}
if(this.sepOper !== -1)
{
var position = { x: this.pos.x, y: this.pos.y + this.align(this.sepOper) };
this.sepOper.setPosition(position);
}
if(this.endOper !== -1)
{
var position = { x: this.pos.x, y: this.pos.y + this.align(this.endOper) };
this.endOper.setPosition(position);
}
for(var j = 0; j < this.nCol; j++)
{
var position =
{
x: this.pos.x,
y: this.pos.y + this.align(this.elements[0][j])
};
this.elements[0][j].setPosition(position);
}*/
}
CDelimiter.prototype.findDisposition = function(pos)
{
}
CDelimiter.prototype.draw = function()
{
if(this.begOper !== -1)
this.begOper.draw();
if(this.endOper !== -1)
this.endOper.draw();
if(this.sepOper !== -1)
this.sepOper.draw();
for(var j = 0; j < this.nCol; j++)
this.elements[0][j].draw();
} }
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