igniteui-webcomponents-excel 7.0.1 → 7.1.0-alpha.0

package/esm5/lib/AlternateContentChoice_combined.js

@@ -6,11 +6,11 @@ GOVERNS THE LICENSING, INSTALLATION AND USE OF INFRAGISTICS SOFTWARE. BY DOWNLOA
 */
 import { __extends, __generator, __read, __spreadArray, __values } from "tslib";
 import { Base, Type, markType, ValueType, markStruct, IDisposable_$type, Stream, toNullable, String_$type, fromEnum, typeCast, typeCastObjTo$t, Boolean_$type, Number_$type, toEnum, getBoxIfEnum, enumGetBox, EnumUtil, typeGetValue } from "igniteui-webcomponents-core";
-import { WorkItem } from "./WorkItem";
 import { IPackagePart_$type } from "./IPackagePart";
 import { ST_ConformanceClass_$type } from "./ST_ConformanceClass";
 import { Stack$1 } from "igniteui-webcomponents-core";
 import { IPackage_$type } from "./IPackage";
+import { WorkItem } from "./WorkItem";
 import { HashSet$1 } from "igniteui-webcomponents-core";
 import { StringUtilities } from "./StringUtilities";
 import { Dictionary$2 } from "igniteui-webcomponents-core";
@@ -131,24 +131,11 @@ export var AlternateContentChoice = /** @class */ /*@__PURE__*/ (function (_supe
             _rest[_0 - 1] = arguments[_0];
         }
         var _this = _super.call(this) || this;
-        _this.b = null;
         _this.a = null;
+        _this.b = null;
         a = (a == void 0) ? 0 : a;
         switch (a) {
             case 0:
-                {
-                    var c = _rest[0];
-                    var d_1 = _rest[1];
-                    var e = [[c], function () { return WorkItem.c(d_1); }];
-                    {
-                        var g = e[0];
-                        var h = e[1];
-                        _this.b = h;
-                        _this.a = g;
-                    }
-                }
-                break;
-            case 1:
                 {
                     var c = _rest[0];
                     var d = _rest[1];
@@ -156,30 +143,17 @@ export var AlternateContentChoice = /** @class */ /*@__PURE__*/ (function (_supe
                     {
                         var g = e[0];
                         var h = e[1];
-                        _this.b = h;
-                        _this.a = g;
+                        _this.a = h;
+                        _this.b = g;
                     }
                 }
                 break;
-            case 2:
-                {
-                    var c = _rest[0];
-                    var d_2 = _rest[1];
-                    var e = [c, function () { return WorkItem.c(d_2); }];
-                    {
-                        var g = e[0];
-                        var h = e[1];
-                        _this.b = h;
-                        _this.a = g;
-                    }
-                }
-                break;
-            case 3:
+            case 1:
                 {
                     var c = _rest[0];
                     var d = _rest[1];
-                    _this.b = d;
-                    _this.a = c;
+                    _this.a = d;
+                    _this.b = c;
                 }
                 break;
         }
@@ -2092,20 +2066,20 @@ export var XmlWriteManager = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(XmlWriteManager, _super);
     function XmlWriteManager(a, b) {
         var _this = _super.call(this) || this;
-        _this.b = null;
-        _this.d = null;
+        _this.a = null;
         _this.c = null;
-        _this.x = null;
-        _this.d = new List$1(String_$type, 0);
-        _this.b = a.d;
-        _this.c = a;
-        _this.x = b;
+        _this.b = null;
+        _this.w = null;
+        _this.c = new List$1(String_$type, 0);
+        _this.a = a.d;
+        _this.b = a;
+        _this.w = b;
         return _this;
     }
-    XmlWriteManager.prototype.e = function (a) {
-        return this.x.a(a.s(this.b._ab));
+    XmlWriteManager.prototype.d = function (a) {
+        return this.w.a(a.s(this.a._ab));
     };
-    XmlWriteManager.prototype.f = function (a, b, c, d) {
+    XmlWriteManager.prototype.e = function (a, b, c, d) {
         var e = a.lastIndexOf("/");
         if (e < 0) {
             c = a;
@@ -2119,16 +2093,16 @@ export var XmlWriteManager = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         c = a.substr(e + 1);
         d = a.substr(0, e);
-        if (this.b._ab != 1) {
-            var f = this.b._w(d);
+        if (this.a._ab != 1) {
+            var f = this.a._w(d);
             if (f != null) {
-                d = f.s(this.b._ab);
+                d = f.s(this.a._ab);
             }
         }
-        b = this.x.a(d);
+        b = this.w.a(d);
         if (stringIsNullOrEmpty(b)) {
             var g = d + "/";
-            b = this.x.a(g);
+            b = this.w.a(g);
             if (stringIsNullOrEmpty(b) == false) {
                 d = g;
             }
@@ -2139,24 +2113,16 @@ export var XmlWriteManager = /** @class */ /*@__PURE__*/ (function (_super) {
             p3: d
         };
     };
-    XmlWriteManager.prototype.g = function () {
-        if (this.d.count == 0) {
+    XmlWriteManager.prototype.f = function () {
+        if (this.c.count == 0) {
             return;
         }
-        this.m(MarkupCompatibility2006.ao);
-        this.i(MarkupCompatibility2006.at, stringJoin1(String_$type, " ", this.d));
-        this.d.clear();
+        this.l(MarkupCompatibility2006.ao);
+        this.h(MarkupCompatibility2006.at, stringJoin1(String_$type, " ", this.c));
+        this.c.clear();
     };
-    XmlWriteManager.prototype.h = function (a, b, c) {
-        if (b === void 0) {
-            b = null;
-        }
-        if (c === void 0) {
-            c = true;
-        }
-        WorkItemExtensions.o(this.a(a, function () { return b == null ? null : WorkItem.c(b); }, c));
-    };
-    XmlWriteManager.prototype.a = function (a, b, c) {
+    XmlWriteManager.prototype.g = function (a, b, c) {
+        var e_11, _0, e_12, _1, e_13, _2, e_14, _3;
         var _this = this;
         if (b === void 0) {
             b = null;
@@ -2164,15 +2130,14 @@ export var XmlWriteManager = /** @class */ /*@__PURE__*/ (function (_super) {
         if (c === void 0) {
             c = true;
         }
-        return WorkItemExtensions.c(Async.g(a != null, function () {
-            var e_11, _0, e_12, _1, e_13, _2;
+        if (a != null) {
             var d = new HashSet$1(XmlNamespaceDefinitionBase.$, 0);
             try {
-                for (var _3 = __values(fromEnum(a)), _4 = _3.next(); !_4.done; _4 = _3.next()) {
-                    var e = _4.value;
+                for (var _4 = __values(fromEnum(a)), _5 = _4.next(); !_5.done; _5 = _4.next()) {
+                    var e = _5.value;
                     try {
-                        for (var _5 = (e_12 = void 0, __values(fromEnum(Enumerable.u(XmlNamespaceDefinitionBase.$, e.a, function (g) { return _this.e(g) == null; })))), _6 = _5.next(); !_6.done; _6 = _5.next()) {
-                            var f = _6.value;
+                        for (var _6 = (e_12 = void 0, __values(fromEnum(Enumerable.u(XmlNamespaceDefinitionBase.$, e.b, function (g) { return _this.d(g) == null; })))), _7 = _6.next(); !_7.done; _7 = _6.next()) {
+                            var f = _7.value;
                             d.add_1(f);
                         }
                     }
@@ -2181,8 +2146,8 @@ export var XmlWriteManager = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                     finally {
                         try {
-                            if (_6 && !_6.done && (_1 = _5.return))
-                                _1.call(_5);
+                            if (_7 && !_7.done && (_1 = _6.return))
+                                _1.call(_6);
                         }
                         finally {
                             if (e_12)
@@ -2196,19 +2161,19 @@ export var XmlWriteManager = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             finally {
                 try {
-                    if (_4 && !_4.done && (_0 = _3.return))
-                        _0.call(_3);
+                    if (_5 && !_5.done && (_0 = _4.return))
+                        _0.call(_4);
                 }
                 finally {
                     if (e_11)
                         throw e_11.error;
                 }
             }
-            MarkupCompatibility2006.az(_this.c);
+            MarkupCompatibility2006.az(this.b);
             try {
-                for (var _7 = __values(fromEnum(d)), _8 = _7.next(); !_8.done; _8 = _7.next()) {
-                    var g = _8.value;
-                    _this.m(g);
+                for (var _8 = __values(fromEnum(d)), _9 = _8.next(); !_9.done; _9 = _8.next()) {
+                    var g = _9.value;
+                    this.l(g);
                 }
             }
             catch (e_13_1) {
@@ -2216,123 +2181,139 @@ export var XmlWriteManager = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             finally {
                 try {
-                    if (_8 && !_8.done && (_2 = _7.return))
-                        _2.call(_7);
+                    if (_9 && !_9.done && (_2 = _8.return))
+                        _2.call(_8);
                 }
                 finally {
                     if (e_13)
                         throw e_13.error;
                 }
             }
-            return Async.d(AlternateContentChoice.$, a, function (h) {
-                MarkupCompatibility2006.a0(_this.c, h.a);
-                return WorkItemExtensions.a(h.b(), function () { return _this.l(); });
-            });
-        }), function () {
-            return WorkItemExtensions.a(Async.g(b != null, function () {
-                MarkupCompatibility2006.a2(_this.c);
-                return WorkItemExtensions.a(b(), function () { return _this.l(); });
-            }), function () {
-                if (c) {
-                    _this.l();
+            try {
+                for (var _10 = __values(fromEnum(a)), _11 = _10.next(); !_11.done; _11 = _10.next()) {
+                    var h = _11.value;
+                    MarkupCompatibility2006.a0(this.b, h.b);
+                    h.a();
+                    this.k();
                 }
-            });
-        });
+            }
+            catch (e_14_1) {
+                e_14 = { error: e_14_1 };
+            }
+            finally {
+                try {
+                    if (_11 && !_11.done && (_3 = _10.return))
+                        _3.call(_10);
+                }
+                finally {
+                    if (e_14)
+                        throw e_14.error;
+                }
+            }
+        }
+        if (b != null) {
+            MarkupCompatibility2006.a2(this.b);
+            b();
+            this.k();
+        }
+        if (c) {
+            this.k();
+        }
     };
-    XmlWriteManager.prototype.i = function (a, b) {
+    XmlWriteManager.prototype.h = function (a, b) {
         if (b == null) {
             return;
         }
         var c;
         var d;
         var e;
-        var f = this.f(a, c, d, e);
+        var f = this.e(a, c, d, e);
         c = f.p1;
         d = f.p2;
         e = f.p3;
-        this.j(c, d, e, b);
+        this.i(c, d, e, b);
     };
-    XmlWriteManager.prototype.j = function (a, b, c, d) {
-        this.x.j(a, b, c, d);
+    XmlWriteManager.prototype.i = function (a, b, c, d) {
+        this.w.j(a, b, c, d);
     };
-    XmlWriteManager.prototype.k = function (a, b) {
-        this.x.h(a, b);
+    XmlWriteManager.prototype.j = function (a, b) {
+        this.w.h(a, b);
     };
-    XmlWriteManager.prototype.l = function () {
-        this.g();
-        this.x.v();
+    XmlWriteManager.prototype.k = function () {
+        this.f();
+        this.w.v();
     };
-    XmlWriteManager.prototype.p = function (a) {
-        this.q(a, null);
+    XmlWriteManager.prototype.o = function (a) {
+        this.p(a, null);
     };
-    XmlWriteManager.prototype.q = function (a, b) {
+    XmlWriteManager.prototype.p = function (a, b) {
         var c;
         var d;
         var e;
-        var f = this.f(a, c, d, e);
+        var f = this.e(a, c, d, e);
         c = f.p1;
         d = f.p2;
         e = f.p3;
-        this.r(c != null ? c : b, d, e);
+        this.q(c != null ? c : b, d, e);
     };
-    XmlWriteManager.prototype.r = function (a, b, c) {
-        this.g();
-        this.x.ao(a, b, c);
+    XmlWriteManager.prototype.q = function (a, b, c) {
+        this.f();
+        this.w.ao(a, b, c);
     };
-    XmlWriteManager.prototype.s = function (a) {
-        this.x.am(a);
+    XmlWriteManager.prototype.r = function (a) {
+        this.w.am(a);
     };
-    XmlWriteManager.prototype.m = function (a, b) {
+    XmlWriteManager.prototype.l = function (a, b) {
         if (b === void 0) {
             b = false;
         }
-        this.n(a.t, a.s(this.b._ab), b);
+        this.m(a.t, a.s(this.a._ab), b);
     };
-    XmlWriteManager.prototype.n = function (a, b, c) {
+    XmlWriteManager.prototype.m = function (a, b, c) {
         if (c === void 0) {
             c = false;
         }
         var d = b;
-        if (this.b._ab != 1) {
-            var e = this.b._w(b);
+        if (this.a._ab != 1) {
+            var e = this.a._w(b);
             if (e != null) {
-                d = e.s(this.b._ab);
+                d = e.s(this.a._ab);
             }
         }
-        this.x.j("xmlns", a, "http://www.w3.org/2000/xmlns/", d);
+        this.w.j("xmlns", a, "http://www.w3.org/2000/xmlns/", d);
         if (c) {
-            this.d.add(a);
+            this.c.add(a);
         }
     };
-    XmlWriteManager.prototype.o = function (a) {
-        this.g();
-        this.x.ah(a);
+    XmlWriteManager.prototype.n = function (a) {
+        this.f();
+        this.w.ah(a);
     };
-    XmlWriteManager.prototype.u = function (a) {
-        this.g();
+    XmlWriteManager.prototype.t = function (a) {
+        this.f();
         var b = new Stack$1(UnknownElementCache.$);
-        this.t(a.b, b);
+        this.s(a.b, b);
     };
-    XmlWriteManager.prototype.t = function (a, b) {
-        var e_14, _0, e_15, _1;
-        var c = this.c.y(a, b);
+    XmlWriteManager.prototype.s = function (a, b) {
+        var e_15, _0, e_16, _1;
+        var c = this.b.y(a, b);
         var t1 = c;
         L0: while (true) {
             switch (t1) {
                 case 0:
                     {
-                        var d = a.b.b(this.b);
-                        this.r(d.h, d.f, d.g);
+                        var d = a.b.b(this.a);
+                        this.q(d.h, d.f, d.g);
                         if (a.d) {
                             try {
-                                for (var _2 = (e_14 = void 0, __values(fromEnum(a.j))), _3 = _2.next(); !_3.done; _3 = _2.next()) {
+                                for (var _2 = (e_15 = void 0, __values(fromEnum(a.j))), _3 = _2.next(); !_3.done; _3 = _2.next()) {
                                     var e = _3.value;
-                                    var f = e.a.b(this.b);
-                                    this.j(f.h, f.f, f.g, e.d);
+                                    var f = e.a.b(this.a);
+                                    this.i(f.h, f.f, f.g, e.d);
                                 }
                             }
-                            catch (e_14_1) {
-                                e_14 = { error: e_14_1 };
+                            catch (e_15_1) {
+                                e_15 = { error: e_15_1 };
                             }
                             finally {
                                 try {
@@ -2340,13 +2321,13 @@ export var XmlWriteManager = /** @class */ /*@__PURE__*/ (function (_super) {
                                         _0.call(_2);
                                 }
                                 finally {
-                                    if (e_14)
-                                        throw e_14.error;
+                                    if (e_15)
+                                        throw e_15.error;
                                 }
                             }
                         }
                         if (a.p != null) {
-                            this.v(a.p);
+                            this.u(a.p);
                         }
                     }
                     t1 = 1;
@@ -2356,13 +2337,13 @@ export var XmlWriteManager = /** @class */ /*@__PURE__*/ (function (_super) {
                         if (a.e) {
                             b.h(a);
                             try {
-                                for (var _4 = (e_15 = void 0, __values(fromEnum(a.k))), _5 = _4.next(); !_5.done; _5 = _4.next()) {
+                                for (var _4 = (e_16 = void 0, __values(fromEnum(a.k))), _5 = _4.next(); !_5.done; _5 = _4.next()) {
                                     var g = _5.value;
-                                    this.t(g, b);
+                                    this.s(g, b);
                                 }
                             }
-                            catch (e_15_1) {
-                                e_15 = { error: e_15_1 };
+                            catch (e_16_1) {
+                                e_16 = { error: e_16_1 };
                             }
                             finally {
                                 try {
@@ -2370,13 +2351,13 @@ export var XmlWriteManager = /** @class */ /*@__PURE__*/ (function (_super) {
                                         _1.call(_4);
                                 }
                                 finally {
-                                    if (e_15)
-                                        throw e_15.error;
+                                    if (e_16)
+                                        throw e_16.error;
                                 }
                             }
                             b.e();
                         }
-                        this.l();
+                        this.k();
                     }
                     break;
                 case 2: break;
@@ -2387,12 +2368,12 @@ export var XmlWriteManager = /** @class */ /*@__PURE__*/ (function (_super) {
             break;
         }
     };
-    XmlWriteManager.prototype.v = function (a) {
-        this.g();
-        this.x.ap(a);
+    XmlWriteManager.prototype.u = function (a) {
+        this.f();
+        this.w.ap(a);
     };
-    XmlWriteManager.prototype.w = function (a, b, c) {
-        this.g();
+    XmlWriteManager.prototype.v = function (a, b, c) {
+        this.f();
         var d = new StringBuilder(2, "version=\"" + a + "\"");
         if (b.length > 0) {
             d.l(" encoding=\"");
@@ -2405,7 +2386,7 @@ export var XmlWriteManager = /** @class */ /*@__PURE__*/ (function (_super) {
             d.l("\"");
         }
         var e = d.toString();
-        this.x.ad("xml", e);
+        this.w.ad("xml", e);
     };
     XmlWriteManager.$t = markType(XmlWriteManager, 'XmlWriteManager');
     return XmlWriteManager;
@@ -2636,7 +2617,7 @@ export var XmlPartManagerBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return Async.n(XmlWriter.$, this.a2(), function (b) {
             _this.ac = new XmlWriteManager(_this, b);
             if (_this.aj) {
-                _this.ac.w("1.0", "UTF-8", "yes");
+                _this.ac.v("1.0", "UTF-8", "yes");
             }
             return _this.u(a);
         });
@@ -2689,7 +2670,7 @@ export var XmlPartManagerBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return a == b;
     };
     XmlPartManagerBase.prototype.ao = function (a) {
-        var e_16, _0;
+        var e_17, _0;
         var b = this.ab.u;
         var c = null;
         try {
@@ -2702,8 +2683,8 @@ export var XmlPartManagerBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        catch (e_16_1) {
-            e_16 = { error: e_16_1 };
+        catch (e_17_1) {
+            e_17 = { error: e_17_1 };
         }
         finally {
             try {
@@ -2711,8 +2692,8 @@ export var XmlPartManagerBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     _0.call(_1);
             }
             finally {
-                if (e_16)
-                    throw e_16.error;
+                if (e_17)
+                    throw e_17.error;
             }
         }
         return c;
@@ -3219,7 +3200,7 @@ export var RoundTripDataPartManager = /** @class */ /*@__PURE__*/ (function (_su
         return RoundTripDataPartManager.r(a, DocCoreUtils.c(b), c);
     };
     RoundTripDataPartManager.r = function (a, b, c) {
-        var e_17, _0;
+        var e_18, _0;
         var d = new RoundTripControlData(c, a._d.uri.toString(), a._ab, b);
         var _loop_1 = function (e) {
             var f = a._au(e);
@@ -3249,8 +3230,8 @@ export var RoundTripDataPartManager = /** @class */ /*@__PURE__*/ (function (_su
                 _loop_1(e);
             }
         }
-        catch (e_17_1) {
-            e_17 = { error: e_17_1 };
+        catch (e_18_1) {
+            e_18 = { error: e_18_1 };
         }
         finally {
             try {
@@ -3258,8 +3239,8 @@ export var RoundTripDataPartManager = /** @class */ /*@__PURE__*/ (function (_su
                     _0.call(_1);
             }
             finally {
-                if (e_17)
-                    throw e_17.error;
+                if (e_18)
+                    throw e_18.error;
             }
         }
         return d;
@@ -3507,7 +3488,7 @@ export var XmlNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (function (_
     XmlNamespaceDefinitionBase.z = function (a, b) {
     };
     XmlNamespaceDefinitionBase.y = function (a) {
-        var e_18, _0;
+        var e_19, _0;
         try {
             for (var _1 = __values(fromEnum(a.ab.u)), _2 = _1.next(); !_2.done; _2 = _1.next()) {
                 var b = _2.value;
@@ -3516,8 +3497,8 @@ export var XmlNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (function (_
                 }
             }
         }
-        catch (e_18_1) {
-            e_18 = { error: e_18_1 };
+        catch (e_19_1) {
+            e_19 = { error: e_19_1 };
         }
         finally {
             try {
@@ -3525,8 +3506,8 @@ export var XmlNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (function (_
                     _0.call(_1);
             }
             finally {
-                if (e_18)
-                    throw e_18.error;
+                if (e_19)
+                    throw e_19.error;
             }
         }
     };
@@ -3631,15 +3612,15 @@ export var XmlNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (function (_
         return c;
     };
     XmlNamespaceDefinitionBase.aa = function (a, b, c, d) {
-        a.ad.q(b, c);
-        a.ad.v(d.toString().toLowerCase());
+        a.ad.p(b, c);
+        a.ad.u(d.toString().toLowerCase());
     };
     XmlNamespaceDefinitionBase.n = function (a, b) {
         return parseInt8_1(a.ab.ad, CultureInfo.invariantCulture);
     };
     XmlNamespaceDefinitionBase.ab = function (a, b, c, d) {
-        a.ad.q(b, c);
-        a.ad.v(d.toString());
+        a.ad.p(b, c);
+        a.ad.u(d.toString());
     };
     XmlNamespaceDefinitionBase.h = function (a, b) {
         var c = a.ao(XmlSchemaInstance.ar);
@@ -3647,31 +3628,31 @@ export var XmlNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (function (_
         return PackageUtilities.i(a.ab.ad);
     };
     XmlNamespaceDefinitionBase.ac = function (a, b, c, d) {
-        a.ad.q(b, c);
+        a.ad.p(b, c);
         var e = new QualifiedNameInfo(1, DcTerms.ao.t, DcTerms.ao.s(a.d._ab), XmlNamespaceDefinitionBase.r("http://purl.org/dc/terms/W3CDTF"));
-        a.ad.i(XmlSchemaInstance.ar, e.toString());
-        a.ad.v(PackageUtilities.k(d));
+        a.ad.h(XmlSchemaInstance.ar, e.toString());
+        a.ad.u(PackageUtilities.k(d));
     };
     XmlNamespaceDefinitionBase.i = function (a, b) {
         return parseNumber(a.ab.ad, CultureInfo.invariantCulture);
     };
     XmlNamespaceDefinitionBase.ad = function (a, b, c, d) {
-        a.ad.q(b, c);
-        a.ad.v(numberToString(d, CultureInfo.invariantCulture));
+        a.ad.p(b, c);
+        a.ad.u(numberToString(d, CultureInfo.invariantCulture));
     };
     XmlNamespaceDefinitionBase.j = function (a, b) {
         return parseNumber(a.ab.ad, CultureInfo.invariantCulture);
     };
     XmlNamespaceDefinitionBase.ae = function (a, b, c, d) {
-        a.ad.q(b, c);
-        a.ad.v(numberToString(d, CultureInfo.invariantCulture));
+        a.ad.p(b, c);
+        a.ad.u(numberToString(d, CultureInfo.invariantCulture));
     };
     XmlNamespaceDefinitionBase.o = function (a, b) {
         return parseNumber(a.ab.ad, CultureInfo.invariantCulture);
     };
     XmlNamespaceDefinitionBase.af = function (a, b, c, d) {
-        a.ad.q(b, c);
-        a.ad.v(numberToString(d, CultureInfo.invariantCulture));
+        a.ad.p(b, c);
+        a.ad.u(numberToString(d, CultureInfo.invariantCulture));
     };
     XmlNamespaceDefinitionBase.l = function (a, b, c) {
         if (c === void 0) {
@@ -3687,22 +3668,22 @@ export var XmlNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (function (_
         return e;
     };
     XmlNamespaceDefinitionBase.ag = function (a, b, c, d) {
-        a.ad.q(b, c);
-        a.ad.v(d.toString());
+        a.ad.p(b, c);
+        a.ad.u(d.toString());
     };
     XmlNamespaceDefinitionBase.m = function (a, b) {
         return parseInt64_1(a.ab.ad, CultureInfo.invariantCulture);
     };
     XmlNamespaceDefinitionBase.ah = function (a, b, c, d) {
-        a.ad.q(b, c);
-        a.ad.v(d.toString());
+        a.ad.p(b, c);
+        a.ad.u(d.toString());
     };
     XmlNamespaceDefinitionBase.k = function (a, b) {
         return parseInt16_1(a.ab.ad, CultureInfo.invariantCulture);
     };
     XmlNamespaceDefinitionBase.ai = function (a, b, c, d) {
-        a.ad.q(b, c);
-        a.ad.v(d.toString());
+        a.ad.p(b, c);
+        a.ad.u(d.toString());
     };
     XmlNamespaceDefinitionBase.d = function (a) {
         switch (a) {
@@ -3739,7 +3720,7 @@ export var XmlNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (function (_
         if (f === void 0) {
             f = 0;
         }
-        a.ad.q(b, c);
+        a.ad.p(b, c);
         if (f != 6) {
             if (stringIsNullOrEmpty(d) == false) {
                 if ((XmlNamespaceDefinitionBase.d(d.charAt(0)) && (f & 2) == 0) || (XmlNamespaceDefinitionBase.d(d.charAt(d.length - 1)) && (f & 4) == 0)) {
@@ -3750,35 +3731,35 @@ export var XmlNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (function (_
         if (e != null) {
             e();
         }
-        a.ad.v(d);
+        a.ad.u(d);
     };
     XmlNamespaceDefinitionBase.f = function (a, b) {
         return parseUInt8_1(a.ab.ad, CultureInfo.invariantCulture);
     };
     XmlNamespaceDefinitionBase.ak = function (a, b, c, d) {
-        a.ad.q(b, c);
-        a.ad.v(d.toString());
+        a.ad.p(b, c);
+        a.ad.u(d.toString());
     };
     XmlNamespaceDefinitionBase.w = function (a, b) {
         return parseUInt32_1(a.ab.ad, CultureInfo.invariantCulture);
     };
     XmlNamespaceDefinitionBase.al = function (a, b, c, d) {
-        a.ad.q(b, c);
-        a.ad.v(d.toString());
+        a.ad.p(b, c);
+        a.ad.u(d.toString());
     };
     XmlNamespaceDefinitionBase.x = function (a, b) {
         return parseUInt64_1(a.ab.ad, CultureInfo.invariantCulture);
     };
     XmlNamespaceDefinitionBase.am = function (a, b, c, d) {
-        a.ad.q(b, c);
-        a.ad.v(d.toString());
+        a.ad.p(b, c);
+        a.ad.u(d.toString());
     };
     XmlNamespaceDefinitionBase.v = function (a, b) {
         return parseUInt16_1(a.ab.ad, CultureInfo.invariantCulture);
     };
     XmlNamespaceDefinitionBase.an = function (a, b, c, d) {
-        a.ad.q(b, c);
-        a.ad.v(d.toString());
+        a.ad.p(b, c);
+        a.ad.u(d.toString());
     };
     XmlNamespaceDefinitionBase.$t = markType(XmlNamespaceDefinitionBase, 'XmlNamespaceDefinitionBase');
     XmlNamespaceDefinitionBase.a = [' ', '\r', '\n', '\t'];
@@ -3830,13 +3811,13 @@ export var CoreProperties = /** @class */ /*@__PURE__*/ (function (_super) {
     CoreProperties.a0 = function (a) {
     };
     CoreProperties.a7 = function (a) {
-        a.ad.q(CoreProperties.as, "cp");
+        a.ad.p(CoreProperties.as, "cp");
         var b = a.d._ab;
-        a.ad.m(CoreProperties.ao);
-        a.ad.m(DcElements.ao);
-        a.ad.m(DcTerms.ao);
-        a.ad.m(DcDcmiType.ao);
-        a.ad.m(XmlSchemaInstance.ao);
+        a.ad.l(CoreProperties.ao);
+        a.ad.l(DcElements.ao);
+        a.ad.l(DcTerms.ao);
+        a.ad.l(DcDcmiType.ao);
+        a.ad.l(XmlSchemaInstance.ao);
     };
     CoreProperties.a1 = function (a, b, c) {
         b = a.ao(XmlNamespace.aq);
@@ -3847,11 +3828,11 @@ export var CoreProperties = /** @class */ /*@__PURE__*/ (function (_super) {
         };
     };
     CoreProperties.a8 = function (a, b, c) {
-        a.ad.q(CoreProperties.at, "cp");
+        a.ad.p(CoreProperties.at, "cp");
         var d;
         d = b;
-        a.ad.i(XmlNamespace.aq, d);
-        a.ad.v(c);
+        a.ad.h(XmlNamespace.aq, d);
+        a.ad.u(c);
     };
     CoreProperties.a2 = function (a, b) {
         b = XmlNamespaceDefinitionBase.u(a, CoreProperties.au);
@@ -4045,8 +4026,8 @@ export var Drawing2010Main = /** @class */ /*@__PURE__*/ (function (_super) {
     Drawing2010Main.prototype.s = function (a) {
         switch (a) {
             case 0:
-            case 1: return Drawing2010Main.at;
-            default: return Drawing2010Main.at;
+            case 1: return Drawing2010Main.aq;
+            default: return Drawing2010Main.aq;
         }
     };
     Drawing2010Main.prototype.get_t = function () {
@@ -4059,58 +4040,8 @@ export var Drawing2010Main = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Drawing2010Main.prototype.av = function (a, b, c) {
-        var e_19, _0;
-        b = null;
-        c = null;
-        try {
-            for (var _1 = __values(fromEnum(a.ab.u)), _2 = _1.next(); !_2.done; _2 = _1.next()) {
-                var d = _2.value;
-                switch (d.a.e(a.d)) {
-                    case "cellRange":
-                        b = d.d;
-                        break;
-                    case "spid":
-                        c = d.d;
-                        break;
-                    default: break;
-                }
-            }
-        }
-        catch (e_19_1) {
-            e_19 = { error: e_19_1 };
-        }
-        finally {
-            try {
-                if (_2 && !_2.done && (_0 = _1.return))
-                    _0.call(_1);
-            }
-            finally {
-                if (e_19)
-                    throw e_19.error;
-            }
-        }
-        return {
-            p1: b,
-            p2: c
-        };
-    };
-    Drawing2010Main.prototype.aw = function (a, b, c) {
-        if (c === void 0) {
-            c = null;
-        }
-        a.ad.q(Drawing2010Main.aq, this.t);
-        var d;
-        d = b;
-        a.ad.i("cellRange", d);
-        if (c != null) {
-            d = c;
-            a.ad.i("spid", d);
-        }
-    };
     Drawing2010Main.$t = markType(Drawing2010Main, 'Drawing2010Main', XmlNamespaceDefinitionBase.$);
-    Drawing2010Main.at = "http://schemas.microsoft.com/office/drawing/2010/main";
-    Drawing2010Main.aq = Drawing2010Main.at + "/cameraTool";
+    Drawing2010Main.aq = "http://schemas.microsoft.com/office/drawing/2010/main";
     Drawing2010Main.ao = new Drawing2010Main();
     return Drawing2010Main;
 }(XmlNamespaceDefinitionBase));
@@ -4146,10 +4077,10 @@ export var Drawing2010Slicer = /** @class */ /*@__PURE__*/ (function (_super) {
         };
     };
     Drawing2010Slicer.av = function (a, b) {
-        a.ad.q(Drawing2010Slicer.at, "sle");
+        a.ad.p(Drawing2010Slicer.at, "sle");
         var c;
         c = b;
-        a.ad.i("name", c);
+        a.ad.h("name", c);
     };
     Drawing2010Slicer.$t = markType(Drawing2010Slicer, 'Drawing2010Slicer', XmlNamespaceDefinitionBase.$);
     Drawing2010Slicer.as = "http://schemas.microsoft.com/office/drawing/2010/slicer";
@@ -4192,12 +4123,12 @@ export var DrawingMLChart = /** @class */ /*@__PURE__*/ (function (_super) {
         if (b === void 0) {
             b = null;
         }
-        a.ad.q(DrawingMLChart.bf, "c");
-        a.ad.m(DrawingMLChart.ao);
-        a.ad.m(OfficeDocumentRelationships.ao);
+        a.ad.p(DrawingMLChart.bf, "c");
+        a.ad.l(DrawingMLChart.ao);
+        a.ad.l(OfficeDocumentRelationships.ao);
         var c;
         c = b;
-        a.ad.i(OfficeDocumentRelationships.as, c);
+        a.ad.h(OfficeDocumentRelationships.as, c);
     };
     DrawingMLChart.$t = markType(DrawingMLChart, 'DrawingMLChart', XmlNamespaceDefinitionBase.$);
     DrawingMLChart.dy = "http://schemas.openxmlformats.org/drawingml/2006/chart";
@@ -4461,12 +4392,12 @@ export var DrawingMLChart2014 = /** @class */ /*@__PURE__*/ (function (_super) {
         if (b === void 0) {
             b = null;
         }
-        a.ad.q(DrawingMLChart2014.aq, "cx");
-        a.ad.m(DrawingMLChart2014.ao);
-        a.ad.m(OfficeDocumentRelationships.ao);
+        a.ad.p(DrawingMLChart2014.aq, "cx");
+        a.ad.l(DrawingMLChart2014.ao);
+        a.ad.l(OfficeDocumentRelationships.ao);
         var c;
         c = b;
-        a.ad.i(OfficeDocumentRelationships.as, c);
+        a.ad.h(OfficeDocumentRelationships.as, c);
     };
     DrawingMLChart2014.$t = markType(DrawingMLChart2014, 'DrawingMLChart2014', XmlNamespaceDefinitionBase.$);
     DrawingMLChart2014.at = "http://schemas.microsoft.com/office/drawing/2014/chartex";
@@ -4597,7 +4528,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    DrawingMLMain.kx = function (a, b, c) {
+    DrawingMLMain.kw = function (a, b, c) {
         var d = a.ao("val");
         if (d == null) {
             c = ST_Angle.a(0);
@@ -4609,18 +4540,18 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.nz = function (a, b, c) {
-        a.ad.q(b, "a");
+    DrawingMLMain.nx = function (a, b, c) {
+        a.ad.p(b, "a");
         var d;
         d = c.toString();
-        a.ad.i("val", d);
+        a.ad.h("val", d);
     };
-    DrawingMLMain.ky = function (a, b) {
+    DrawingMLMain.kx = function (a, b) {
     };
-    DrawingMLMain.n0 = function (a, b) {
-        a.ad.q(b, "a");
+    DrawingMLMain.ny = function (a, b) {
+        a.ad.p(b, "a");
     };
-    DrawingMLMain.kz = function (a, b, c) {
+    DrawingMLMain.ky = function (a, b, c) {
         var d = a.ao("val");
         if (d == null) {
             c = new ST_FixedPercentage();
@@ -4632,13 +4563,13 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.n1 = function (a, b, c) {
-        a.ad.q(b, "a");
+    DrawingMLMain.nz = function (a, b, c) {
+        a.ad.p(b, "a");
         var d;
         d = c.s(a.d._ab);
-        a.ad.i("val", d);
+        a.ad.h("val", d);
     };
-    DrawingMLMain.k0 = function (a, b, c, d, e) {
+    DrawingMLMain.kz = function (a, b, c, d, e) {
         var e_20, _0;
         c = toNullable(ST_LineEndType_$type, null);
         d = toNullable(ST_LineEndWidth_$type, null);
@@ -4679,23 +4610,23 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    DrawingMLMain.n2 = function (a, b, c, d, e) {
-        a.ad.q(b, "a");
+    DrawingMLMain.n0 = function (a, b, c, d, e) {
+        a.ad.p(b, "a");
         var f;
         if (nullableNotEquals(c, null)) {
             f = XmlNamespaceDefinitionBase.p(ST_LineEndType_$type, c.value);
-            a.ad.i("type", f);
+            a.ad.h("type", f);
         }
         if (nullableNotEquals(d, null)) {
             f = XmlNamespaceDefinitionBase.p(ST_LineEndWidth_$type, d.value);
-            a.ad.i("w", f);
+            a.ad.h("w", f);
         }
         if (nullableNotEquals(e, null)) {
             f = XmlNamespaceDefinitionBase.p(ST_LineEndLength_$type, e.value);
-            a.ad.i("len", f);
+            a.ad.h("len", f);
         }
     };
-    DrawingMLMain.k1 = function (a, b, c, d, e, f, g) {
+    DrawingMLMain.k0 = function (a, b, c, d, e, f, g) {
         var e_21, _0;
         c = new ST_DrawingElementId();
         d = null;
@@ -4746,23 +4677,23 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p6: g
         };
     };
-    DrawingMLMain.n3 = function (a, b, c, d, e, f, g) {
-        a.ad.q(b, "a");
+    DrawingMLMain.n1 = function (a, b, c, d, e, f, g) {
+        a.ad.p(b, "a");
         var h;
         h = c.toString();
-        a.ad.i("id", h);
+        a.ad.h("id", h);
         h = d;
-        a.ad.i("name", h);
+        a.ad.h("name", h);
         h = e;
-        a.ad.i("descr", h);
+        a.ad.h("descr", h);
         if (f != false) {
             h = ST_OnOff.g(f);
-            a.ad.i("hidden", h);
+            a.ad.h("hidden", h);
         }
         h = g;
-        a.ad.i("title", h);
+        a.ad.h("title", h);
     };
-    DrawingMLMain.k2 = function (a, b, c) {
+    DrawingMLMain.k1 = function (a, b, c) {
         var d = a.ao("val");
         if (d == null) {
             c = new ST_Percentage();
@@ -4774,13 +4705,13 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.n4 = function (a, b, c) {
-        a.ad.q(b, "a");
+    DrawingMLMain.n2 = function (a, b, c) {
+        a.ad.p(b, "a");
         var d;
         d = c.r(a.d._ab);
-        a.ad.i("val", d);
+        a.ad.h("val", d);
     };
-    DrawingMLMain.k3 = function (a, b, c, d) {
+    DrawingMLMain.k2 = function (a, b, c, d) {
         var e_22, _0;
         c = new ST_Coordinate();
         d = new ST_Coordinate();
@@ -4816,15 +4747,15 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p3: d
         };
     };
-    DrawingMLMain.n5 = function (a, b, c, d) {
-        a.ad.q(b, "a");
+    DrawingMLMain.n3 = function (a, b, c, d) {
+        a.ad.p(b, "a");
         var e;
         e = c.toString();
-        a.ad.i("x", e);
+        a.ad.h("x", e);
         e = d.toString();
-        a.ad.i("y", e);
+        a.ad.h("y", e);
     };
-    DrawingMLMain.k4 = function (a, b, c) {
+    DrawingMLMain.k3 = function (a, b, c) {
         var d = a.ao("val");
         if (d == null) {
             c = ST_PositiveFixedAngle.e(ST_Angle.a(0));
@@ -4836,13 +4767,13 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.n6 = function (a, b, c) {
-        a.ad.q(b, "a");
+    DrawingMLMain.n4 = function (a, b, c) {
+        a.ad.p(b, "a");
         var d;
         d = c.toString();
-        a.ad.i("val", d);
+        a.ad.h("val", d);
     };
-    DrawingMLMain.k5 = function (a, b, c) {
+    DrawingMLMain.k4 = function (a, b, c) {
         var d = a.ao("val");
         if (d == null) {
             c = new ST_PositiveFixedPercentage();
@@ -4854,13 +4785,13 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.n7 = function (a, b, c) {
-        a.ad.q(b, "a");
+    DrawingMLMain.n5 = function (a, b, c) {
+        a.ad.p(b, "a");
         var d;
         d = c.u(a.d._ab);
-        a.ad.i("val", d);
+        a.ad.h("val", d);
     };
-    DrawingMLMain.k6 = function (a, b, c) {
+    DrawingMLMain.k5 = function (a, b, c) {
         var d = a.ao("val");
         if (d == null) {
             c = new ST_PositivePercentage();
@@ -4872,13 +4803,13 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.n8 = function (a, b, c) {
-        a.ad.q(b, "a");
+    DrawingMLMain.n6 = function (a, b, c) {
+        a.ad.p(b, "a");
         var d;
         d = c.s(a.d._ab);
-        a.ad.i("val", d);
+        a.ad.h("val", d);
     };
-    DrawingMLMain.k7 = function (a, b, c, d) {
+    DrawingMLMain.k6 = function (a, b, c, d) {
         var e_23, _0;
         c = new ST_PositiveCoordinate();
         d = new ST_PositiveCoordinate();
@@ -4914,15 +4845,15 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p3: d
         };
     };
-    DrawingMLMain.n9 = function (a, b, c, d) {
-        a.ad.q(b, "a");
+    DrawingMLMain.n7 = function (a, b, c, d) {
+        a.ad.p(b, "a");
         var e;
         e = c.toString();
-        a.ad.i("cx", e);
+        a.ad.h("cx", e);
         e = d.toString();
-        a.ad.i("cy", e);
+        a.ad.h("cy", e);
     };
-    DrawingMLMain.k8 = function (a, b, c, d, e, f) {
+    DrawingMLMain.k7 = function (a, b, c, d, e, f) {
         var e_24, _0;
         c = ST_Percentage.b(0);
         d = ST_Percentage.b(0);
@@ -4969,28 +4900,28 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p5: f
         };
     };
-    DrawingMLMain.oa = function (a, b, c, d, e, f) {
-        a.ad.q(b, "a");
+    DrawingMLMain.n8 = function (a, b, c, d, e, f) {
+        a.ad.p(b, "a");
         var g;
         var h = a.d._ab;
         if (ST_Percentage.g(c, ST_Percentage.b(0))) {
             g = c.r(h);
-            a.ad.i("l", g);
+            a.ad.h("l", g);
         }
         if (ST_Percentage.g(d, ST_Percentage.b(0))) {
             g = d.r(h);
-            a.ad.i("t", g);
+            a.ad.h("t", g);
         }
         if (ST_Percentage.g(e, ST_Percentage.b(0))) {
             g = e.r(h);
-            a.ad.i("r", g);
+            a.ad.h("r", g);
         }
         if (ST_Percentage.g(f, ST_Percentage.b(0))) {
             g = f.r(h);
-            a.ad.i("b", g);
+            a.ad.h("b", g);
         }
     };
-    DrawingMLMain.k9 = function (a, b, c) {
+    DrawingMLMain.k8 = function (a, b, c) {
         var d = a.ao("idx");
         if (d == null) {
             c = 0;
@@ -5002,13 +4933,13 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.ob = function (a, b, c) {
-        a.ad.q(b, "a");
+    DrawingMLMain.n9 = function (a, b, c) {
+        a.ad.p(b, "a");
         var d;
         d = c.toString();
-        a.ad.i("idx", d);
+        a.ad.h("idx", d);
     };
-    DrawingMLMain.la = function (a, b, c, d, e, f, g) {
+    DrawingMLMain.k9 = function (a, b, c, d, e, f, g) {
         var e_25, _0;
         if (g === void 0) {
             g = true;
@@ -5061,90 +4992,90 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p5: f
         };
     };
-    DrawingMLMain.oc = function (a, b, c, d, e, f) {
-        a.ad.q(b, "a");
+    DrawingMLMain.oa = function (a, b, c, d, e, f) {
+        a.ad.p(b, "a");
         var g;
         g = c != null ? c : "";
-        a.ad.i("typeface", g);
+        a.ad.h("typeface", g);
         if (d != null) {
             g = d.toString();
-            a.ad.i("panose", g);
+            a.ad.h("panose", g);
         }
         if (nullableNotEquals(e, null)) {
             g = e.value.toString();
-            a.ad.i("pitchFamily", g);
+            a.ad.h("pitchFamily", g);
         }
         if (f != 1) {
             g = f.toString();
-            a.ad.i("charset", g);
+            a.ad.h("charset", g);
         }
     };
+    DrawingMLMain.kb = function (a) {
+    };
+    DrawingMLMain.nc = function (a) {
+        DrawingMLMain.ny(a, DrawingMLMain.ar);
+    };
     DrawingMLMain.kc = function (a) {
     };
-    DrawingMLMain.ne = function (a) {
-        DrawingMLMain.n0(a, DrawingMLMain.ar);
+    DrawingMLMain.nd = function (a) {
+        DrawingMLMain.ny(a, DrawingMLMain.as);
     };
     DrawingMLMain.kd = function (a) {
     };
-    DrawingMLMain.nf = function (a) {
-        DrawingMLMain.n0(a, DrawingMLMain.as);
+    DrawingMLMain.ne = function (a) {
+        DrawingMLMain.ny(a, DrawingMLMain.at);
     };
     DrawingMLMain.ke = function (a) {
     };
-    DrawingMLMain.ng = function (a) {
-        DrawingMLMain.n0(a, DrawingMLMain.at);
+    DrawingMLMain.nf = function (a) {
+        DrawingMLMain.ny(a, DrawingMLMain.au);
     };
     DrawingMLMain.kf = function (a) {
     };
-    DrawingMLMain.nh = function (a) {
-        DrawingMLMain.n0(a, DrawingMLMain.au);
+    DrawingMLMain.ng = function (a) {
+        DrawingMLMain.ny(a, DrawingMLMain.av);
     };
     DrawingMLMain.kg = function (a) {
     };
-    DrawingMLMain.ni = function (a) {
-        DrawingMLMain.n0(a, DrawingMLMain.av);
-    };
-    DrawingMLMain.kh = function (a) {
-    };
-    DrawingMLMain.nj = function (a) {
-        DrawingMLMain.n0(a, DrawingMLMain.aw);
+    DrawingMLMain.nh = function (a) {
+        DrawingMLMain.ny(a, DrawingMLMain.aw);
     };
-    DrawingMLMain.ki = function (a, b) {
-        var c = DrawingMLMain.k5(a, DrawingMLMain.a2, b);
+    DrawingMLMain.kh = function (a, b) {
+        var c = DrawingMLMain.k4(a, DrawingMLMain.a2, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.nk = function (a, b) {
-        DrawingMLMain.n7(a, DrawingMLMain.a2, b);
+    DrawingMLMain.ni = function (a, b) {
+        DrawingMLMain.n5(a, DrawingMLMain.a2, b);
     };
-    DrawingMLMain.kj = function (a, b) {
-        var c = DrawingMLMain.k6(a, DrawingMLMain.a7, b);
+    DrawingMLMain.ki = function (a, b) {
+        var c = DrawingMLMain.k5(a, DrawingMLMain.a7, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.nl = function (a, b) {
-        DrawingMLMain.n8(a, DrawingMLMain.a7, b);
+    DrawingMLMain.nj = function (a, b) {
+        DrawingMLMain.n6(a, DrawingMLMain.a7, b);
     };
-    DrawingMLMain.kk = function (a, b) {
-        var c = DrawingMLMain.kz(a, DrawingMLMain.a9, b);
+    DrawingMLMain.kj = function (a, b) {
+        var c = DrawingMLMain.ky(a, DrawingMLMain.a9, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.nm = function (a, b) {
-        DrawingMLMain.n1(a, DrawingMLMain.a9, b);
+    DrawingMLMain.nk = function (a, b) {
+        DrawingMLMain.nz(a, DrawingMLMain.a9, b);
     };
-    DrawingMLMain.kl = function (a) {
+    DrawingMLMain.kk = function (a) {
     };
-    DrawingMLMain.nn = function (a) {
-        a.ad.q(DrawingMLMain.bh, "a");
+    DrawingMLMain.nl = function (a) {
+        a.ad.p(DrawingMLMain.bh, "a");
     };
-    DrawingMLMain.km = function (a, b, c, d, e) {
+    DrawingMLMain.kl = function (a, b, c, d, e) {
         var e_26, _0;
         if (e === void 0) {
             e = true;
@@ -5193,19 +5124,19 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p3: d
         };
     };
-    DrawingMLMain.no = function (a, b, c, d) {
-        a.ad.q(DrawingMLMain.bt, "a");
+    DrawingMLMain.nm = function (a, b, c, d) {
+        a.ad.p(DrawingMLMain.bt, "a");
         var e;
         e = b;
-        a.ad.i(OfficeDocumentRelationships.aq, e);
+        a.ad.h(OfficeDocumentRelationships.aq, e);
         e = c;
-        a.ad.i(OfficeDocumentRelationships.at, e);
+        a.ad.h(OfficeDocumentRelationships.at, e);
         if (d.hasValue && d.value != 0) {
             e = XmlNamespaceDefinitionBase.p(ST_BlipCompression_$type, d.value);
-            a.ad.i("cstate", e);
+            a.ad.h("cstate", e);
         }
     };
-    DrawingMLMain.kn = function (a, b, c) {
+    DrawingMLMain.km = function (a, b, c) {
         var e_27, _0;
         b = toNullable(Number_$type, null);
         c = toNullable(Boolean_$type, null);
@@ -5241,55 +5172,55 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.np = function (a, b, c) {
+    DrawingMLMain.nn = function (a, b, c) {
         if (b === void 0) {
             b = toNullable(Number_$type, null);
         }
         if (c === void 0) {
             c = toNullable(Boolean_$type, null);
         }
-        a.ad.q(DrawingMLMain.bu, "a");
+        a.ad.p(DrawingMLMain.bu, "a");
         var d;
         if (nullableNotEquals(b, null)) {
             d = b.value.toString();
-            a.ad.i("dpi", d);
+            a.ad.h("dpi", d);
         }
         if (nullableNotEquals(c, null)) {
             d = ST_OnOff.g(c.value);
-            a.ad.i("rotWithShape", d);
+            a.ad.h("rotWithShape", d);
         }
     };
-    DrawingMLMain.ko = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.bv, b);
+    DrawingMLMain.kn = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.bv, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.nq = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.bv, b);
+    DrawingMLMain.no = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.bv, b);
     };
-    DrawingMLMain.kp = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.bw, b);
+    DrawingMLMain.ko = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.bw, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.nr = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.bw, b);
+    DrawingMLMain.np = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.bw, b);
     };
-    DrawingMLMain.kq = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.bx, b);
+    DrawingMLMain.kp = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.bx, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.ns = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.bx, b);
+    DrawingMLMain.nq = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.bx, b);
     };
-    DrawingMLMain.kr = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) {
+    DrawingMLMain.kq = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) {
         var e_28, _0;
         b = toNullable(Number_$type, null);
         c = toNullable(Boolean_$type, null);
@@ -5410,7 +5341,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p19: t
         };
     };
-    DrawingMLMain.nt = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) {
+    DrawingMLMain.nr = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) {
         if (b === void 0) {
             b = toNullable(Number_$type, null);
         }
@@ -5468,87 +5399,87 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
         if (t === void 0) {
             t = toNullable(Boolean_$type, null);
         }
-        a.ad.q(DrawingMLMain.b0, "a");
+        a.ad.p(DrawingMLMain.b0, "a");
         var u;
         if (nullableNotEquals(b, null)) {
             u = b.value.toString();
-            a.ad.i("rot", u);
+            a.ad.h("rot", u);
         }
         if (nullableNotEquals(c, null)) {
             u = ST_OnOff.g(c.value);
-            a.ad.i("spcFirstLastPara", u);
+            a.ad.h("spcFirstLastPara", u);
         }
         if (nullableNotEquals(d, null)) {
             u = XmlNamespaceDefinitionBase.p(ST_TextVertOverflowType_$type, d.value);
-            a.ad.i("vertOverflow", u);
+            a.ad.h("vertOverflow", u);
         }
         if (nullableNotEquals(e, null)) {
             u = XmlNamespaceDefinitionBase.p(ST_TextHorzOverflowType_$type, e.value);
-            a.ad.i("horzOverflow", u);
+            a.ad.h("horzOverflow", u);
         }
         if (nullableNotEquals(f, null)) {
             u = XmlNamespaceDefinitionBase.p(ST_TextVerticalType_$type, f.value);
-            a.ad.i("vert", u);
+            a.ad.h("vert", u);
         }
         if (nullableNotEquals(g, null)) {
             u = XmlNamespaceDefinitionBase.p(ST_TextWrappingType_$type, g.value);
-            a.ad.i("wrap", u);
+            a.ad.h("wrap", u);
         }
         if (nullableNotEquals(h, null)) {
             u = h.value.toString();
-            a.ad.i("lIns", u);
+            a.ad.h("lIns", u);
         }
         if (nullableNotEquals(i, null)) {
             u = i.value.toString();
-            a.ad.i("tIns", u);
+            a.ad.h("tIns", u);
         }
         if (nullableNotEquals(j, null)) {
             u = j.value.toString();
-            a.ad.i("rIns", u);
+            a.ad.h("rIns", u);
         }
         if (nullableNotEquals(k, null)) {
             u = k.value.toString();
-            a.ad.i("bIns", u);
+            a.ad.h("bIns", u);
         }
         if (nullableNotEquals(l, null)) {
             u = l.value.toString();
-            a.ad.i("numCol", u);
+            a.ad.h("numCol", u);
         }
         if (nullableNotEquals(m, null)) {
             u = m.value.toString();
-            a.ad.i("spcCol", u);
+            a.ad.h("spcCol", u);
         }
         if (nullableNotEquals(n, null)) {
             u = ST_OnOff.g(n.value);
-            a.ad.i("rtlCol", u);
+            a.ad.h("rtlCol", u);
         }
         if (nullableNotEquals(o, null)) {
             u = ST_OnOff.g(o.value);
-            a.ad.i("fromWordArt", u);
+            a.ad.h("fromWordArt", u);
         }
         if (nullableNotEquals(p, null)) {
             u = XmlNamespaceDefinitionBase.p(ST_TextAnchoringType_$type, p.value);
-            a.ad.i("anchor", u);
+            a.ad.h("anchor", u);
         }
         if (nullableNotEquals(q, null)) {
             u = ST_OnOff.g(q.value);
-            a.ad.i("anchorCtr", u);
+            a.ad.h("anchorCtr", u);
         }
         if (nullableNotEquals(r, null)) {
             u = ST_OnOff.g(r.value);
-            a.ad.i("forceAA", u);
+            a.ad.h("forceAA", u);
         }
         if (s != false) {
             u = ST_OnOff.g(s);
-            a.ad.i("upright", u);
+            a.ad.h("upright", u);
         }
         if (nullableNotEquals(t, null)) {
             u = ST_OnOff.g(t.value);
-            a.ad.i("compatLnSpc", u);
+            a.ad.h("compatLnSpc", u);
         }
     };
-    DrawingMLMain.ks = function (a, b, c) {
-        var d = DrawingMLMain.k7(a, DrawingMLMain.ch, b, c);
+    DrawingMLMain.kr = function (a, b, c) {
+        var d = DrawingMLMain.k6(a, DrawingMLMain.ch, b, c);
         b = d.p2;
         c = d.p3;
         return {
@@ -5556,11 +5487,11 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.nu = function (a, b, c) {
-        DrawingMLMain.n9(a, DrawingMLMain.ch, b, c);
+    DrawingMLMain.ns = function (a, b, c) {
+        DrawingMLMain.n7(a, DrawingMLMain.ch, b, c);
     };
-    DrawingMLMain.kt = function (a, b, c) {
-        var d = DrawingMLMain.k3(a, DrawingMLMain.ci, b, c);
+    DrawingMLMain.ks = function (a, b, c) {
+        var d = DrawingMLMain.k2(a, DrawingMLMain.ci, b, c);
         b = d.p2;
         c = d.p3;
         return {
@@ -5568,31 +5499,31 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.nv = function (a, b, c) {
-        DrawingMLMain.n5(a, DrawingMLMain.ci, b, c);
+    DrawingMLMain.nt = function (a, b, c) {
+        DrawingMLMain.n3(a, DrawingMLMain.ci, b, c);
     };
-    DrawingMLMain.ku = function (a, b) {
+    DrawingMLMain.kt = function (a, b) {
         b = a.ao("name");
         return {
             p1: b
         };
     };
-    DrawingMLMain.nw = function (a, b) {
-        a.ad.q(DrawingMLMain.cn, "a");
+    DrawingMLMain.nu = function (a, b) {
+        a.ad.p(DrawingMLMain.cn, "a");
         var c;
         c = b;
-        a.ad.i("name", c);
+        a.ad.h("name", c);
     };
-    DrawingMLMain.kv = function (a) {
+    DrawingMLMain.ku = function (a) {
     };
-    DrawingMLMain.nx = function (a) {
-        a.ad.q(DrawingMLMain.cq, "a");
+    DrawingMLMain.nv = function (a) {
+        a.ad.p(DrawingMLMain.cq, "a");
     };
-    DrawingMLMain.kw = function (a, b, c, d, e, f) {
+    DrawingMLMain.kv = function (a, b, c, d, e, f) {
         if (f === void 0) {
             f = true;
         }
-        var g = DrawingMLMain.la(a, DrawingMLMain.cu, b, c, d, e);
+        var g = DrawingMLMain.k9(a, DrawingMLMain.cu, b, c, d, e);
         b = g.p2;
         c = g.p3;
         d = g.p4;
@@ -5604,7 +5535,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    DrawingMLMain.ny = function (a, b, c, d, e) {
+    DrawingMLMain.nw = function (a, b, c, d, e) {
         if (c === void 0) {
             c = null;
         }
@@ -5614,9 +5545,9 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
         if (e === void 0) {
             e = 1;
         }
-        DrawingMLMain.oc(a, DrawingMLMain.cu, b, c, d, e);
+        DrawingMLMain.oa(a, DrawingMLMain.cu, b, c, d, e);
     };
-    DrawingMLMain.lb = function (a, b) {
+    DrawingMLMain.la = function (a, b) {
         var c = a.ao("name");
         if (c == null) {
             b = "";
@@ -5628,35 +5559,35 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p1: b
         };
     };
-    DrawingMLMain.od = function (a, b) {
+    DrawingMLMain.ob = function (a, b) {
         if (b === void 0) {
             b = "";
         }
-        a.ad.q(DrawingMLMain.cx, "a");
+        a.ad.p(DrawingMLMain.cx, "a");
         var c;
         if (b != "") {
             c = b;
-            a.ad.i("name", c);
+            a.ad.h("name", c);
         }
     };
-    DrawingMLMain.lc = function (a) {
+    DrawingMLMain.lb = function (a) {
     };
-    DrawingMLMain.oe = function (a) {
-        a.ad.q(DrawingMLMain.cy, "a");
+    DrawingMLMain.oc = function (a) {
+        a.ad.p(DrawingMLMain.cy, "a");
     };
-    DrawingMLMain.ld = function (a) {
+    DrawingMLMain.lc = function (a) {
     };
-    DrawingMLMain.of = function (a) {
-        DrawingMLMain.n0(a, DrawingMLMain.da);
+    DrawingMLMain.od = function (a) {
+        DrawingMLMain.ny(a, DrawingMLMain.da);
     };
-    DrawingMLMain.le = function (a) {
+    DrawingMLMain.ld = function (a) {
     };
-    DrawingMLMain.og = function (a) {
-        DrawingMLMain.n0(a, DrawingMLMain.db);
+    DrawingMLMain.oe = function (a) {
+        DrawingMLMain.ny(a, DrawingMLMain.db);
     };
-    DrawingMLMain.lf = function (a, b, c, d, e) {
+    DrawingMLMain.le = function (a, b, c, d, e) {
         var f = toNullable(Number_$type, null);
-        var g = DrawingMLMain.la(a, DrawingMLMain.df, b, c, d, f);
+        var g = DrawingMLMain.k9(a, DrawingMLMain.df, b, c, d, f);
         b = g.p2;
         c = g.p3;
         d = g.p4;
@@ -5669,7 +5600,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    DrawingMLMain.oh = function (a, b, c, d, e) {
+    DrawingMLMain.of = function (a, b, c, d, e) {
         if (c === void 0) {
             c = null;
         }
@@ -5679,20 +5610,20 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
         if (e === void 0) {
             e = 1;
         }
-        DrawingMLMain.oc(a, DrawingMLMain.df, b, c, d, e);
+        DrawingMLMain.oa(a, DrawingMLMain.df, b, c, d, e);
     };
-    DrawingMLMain.lg = function (a, b) {
-        var c = DrawingMLMain.k9(a, DrawingMLMain.dk, b);
+    DrawingMLMain.lf = function (a, b) {
+        var c = DrawingMLMain.k8(a, DrawingMLMain.dk, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.oi = function (a, b) {
-        DrawingMLMain.ob(a, DrawingMLMain.dk, b);
+    DrawingMLMain.og = function (a, b) {
+        DrawingMLMain.n9(a, DrawingMLMain.dk, b);
     };
-    DrawingMLMain.lh = function (a, b, c) {
-        var d = DrawingMLMain.k7(a, DrawingMLMain.dr, b, c);
+    DrawingMLMain.lg = function (a, b, c) {
+        var d = DrawingMLMain.k6(a, DrawingMLMain.dr, b, c);
         b = d.p2;
         c = d.p3;
         return {
@@ -5700,45 +5631,26 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.oj = function (a, b, c) {
-        DrawingMLMain.n9(a, DrawingMLMain.dr, b, c);
+    DrawingMLMain.oh = function (a, b, c) {
+        DrawingMLMain.n7(a, DrawingMLMain.dr, b, c);
     };
-    DrawingMLMain.ll = function (a, b) {
-        b = a.ao("uri");
-        return {
-            p1: b
-        };
+    DrawingMLMain.lh = function (a) {
     };
-    DrawingMLMain.on = function (a, b, c) {
-        if (c === void 0) {
-            c = null;
-        }
-        a.ad.q(DrawingMLMain.dr, "a");
-        var d;
-        d = b;
-        a.ad.i("uri", d);
-        if (stringIsNullOrEmpty(c) == false) {
-            d = c;
-            a.ad.j("xmlns", "x14", null, d);
-        }
+    DrawingMLMain.oi = function (a) {
+        a.ad.p(DrawingMLMain.ds, "a");
     };
     DrawingMLMain.li = function (a) {
     };
-    DrawingMLMain.ok = function (a) {
-        a.ad.q(DrawingMLMain.ds, "a");
+    DrawingMLMain.oj = function (a) {
+        a.ad.p(DrawingMLMain.dt, "a");
     };
     DrawingMLMain.lj = function (a) {
     };
-    DrawingMLMain.ol = function (a) {
-        a.ad.q(DrawingMLMain.dt, "a");
-    };
-    DrawingMLMain.lk = function (a) {
-    };
-    DrawingMLMain.om = function (a) {
-        a.ad.q(DrawingMLMain.du, "a");
+    DrawingMLMain.ok = function (a) {
+        a.ad.p(DrawingMLMain.du, "a");
     };
-    DrawingMLMain.lm = function (a, b, c, d, e) {
-        var f = DrawingMLMain.k8(a, DrawingMLMain.dz, b, c, d, e);
+    DrawingMLMain.lk = function (a, b, c, d, e) {
+        var f = DrawingMLMain.k7(a, DrawingMLMain.dz, b, c, d, e);
         b = f.p2;
         c = f.p3;
         d = f.p4;
@@ -5750,25 +5662,25 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    DrawingMLMain.oo = function (a, b, c, d, e) {
-        DrawingMLMain.oa(a, DrawingMLMain.dz, b, c, d, e);
+    DrawingMLMain.ol = function (a, b, c, d, e) {
+        DrawingMLMain.n8(a, DrawingMLMain.dz, b, c, d, e);
     };
-    DrawingMLMain.ln = function (a, b) {
-        var c = DrawingMLMain.k9(a, DrawingMLMain.d0, b);
+    DrawingMLMain.ll = function (a, b) {
+        var c = DrawingMLMain.k8(a, DrawingMLMain.d0, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.op = function (a, b) {
-        DrawingMLMain.ob(a, DrawingMLMain.d0, b);
+    DrawingMLMain.om = function (a, b) {
+        DrawingMLMain.n9(a, DrawingMLMain.d0, b);
     };
-    DrawingMLMain.lo = function (a) {
+    DrawingMLMain.lm = function (a) {
     };
-    DrawingMLMain.oq = function (a) {
-        DrawingMLMain.n0(a, DrawingMLMain.d9);
+    DrawingMLMain.on = function (a) {
+        DrawingMLMain.ny(a, DrawingMLMain.d9);
     };
-    DrawingMLMain.lp = function (a, b, c) {
+    DrawingMLMain.ln = function (a, b, c) {
         var e_29, _0;
         b = null;
         c = null;
@@ -5804,15 +5716,15 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.or = function (a, b, c) {
-        a.ad.q(DrawingMLMain.ea, "a");
+    DrawingMLMain.oo = function (a, b, c) {
+        a.ad.p(DrawingMLMain.ea, "a");
         var d;
         d = b;
-        a.ad.i("script", d);
+        a.ad.h("script", d);
         d = c;
-        a.ad.i("typeface", d);
+        a.ad.h("typeface", d);
     };
-    DrawingMLMain.lq = function (a, b) {
+    DrawingMLMain.lo = function (a, b) {
         b = 0;
         var c = a.ao("idx");
         if (c != null) {
@@ -5822,25 +5734,25 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p1: b
         };
     };
-    DrawingMLMain.os = function (a, b) {
-        a.ad.q(DrawingMLMain.ec, "a");
+    DrawingMLMain.op = function (a, b) {
+        a.ad.p(DrawingMLMain.ec, "a");
         var c;
         c = XmlNamespaceDefinitionBase.p(ST_FontCollectionIndex_$type, b);
-        a.ad.i("idx", c);
+        a.ad.h("idx", c);
     };
-    DrawingMLMain.lr = function (a, b) {
+    DrawingMLMain.lp = function (a, b) {
         b = a.ao("name");
         return {
             p1: b
         };
     };
-    DrawingMLMain.ot = function (a, b) {
-        a.ad.q(DrawingMLMain.ed, "a");
+    DrawingMLMain.oq = function (a, b) {
+        a.ad.p(DrawingMLMain.ed, "a");
         var c;
         c = b;
-        a.ad.i("name", c);
+        a.ad.h("name", c);
     };
-    DrawingMLMain.ls = function (a, b, c) {
+    DrawingMLMain.lq = function (a, b, c) {
         var e_30, _0;
         b = null;
         c = null;
@@ -5876,32 +5788,32 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.ou = function (a, b, c) {
-        a.ad.q(DrawingMLMain.eh, "a");
+    DrawingMLMain.or = function (a, b, c) {
+        a.ad.p(DrawingMLMain.eh, "a");
         var d;
         d = b;
-        a.ad.i("name", d);
+        a.ad.h("name", d);
         d = c;
-        a.ad.i("fmla", d);
+        a.ad.h("fmla", d);
     };
-    DrawingMLMain.lt = function (a, b) {
+    DrawingMLMain.lr = function (a, b) {
         b = a.ao("uri");
         return {
             p1: b
         };
     };
-    DrawingMLMain.ov = function (a, b) {
-        a.ad.q(DrawingMLMain.em, "a");
+    DrawingMLMain.os = function (a, b) {
+        a.ad.p(DrawingMLMain.em, "a");
         var c;
         c = b;
-        a.ad.i("uri", c);
+        a.ad.h("uri", c);
     };
-    DrawingMLMain.lu = function (a) {
+    DrawingMLMain.ls = function (a) {
     };
-    DrawingMLMain.ow = function (a) {
-        a.ad.q(DrawingMLMain.el, "a");
+    DrawingMLMain.ot = function (a) {
+        a.ad.p(DrawingMLMain.el, "a");
     };
-    DrawingMLMain.lv = function (a, b, c, d, e, f, g) {
+    DrawingMLMain.lt = function (a, b, c, d, e, f, g) {
         var e_31, _0;
         b = false;
         c = false;
@@ -5957,7 +5869,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p6: g
         };
     };
-    DrawingMLMain.ox = function (a, b, c, d, e, f, g) {
+    DrawingMLMain.ou = function (a, b, c, d, e, f, g) {
         if (b === void 0) {
             b = false;
         }
@@ -5976,75 +5888,75 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
         if (g === void 0) {
             g = false;
         }
-        a.ad.q(DrawingMLMain.en, "a");
+        a.ad.p(DrawingMLMain.en, "a");
         var h;
         if (b != false) {
             h = ST_OnOff.g(b);
-            a.ad.i("noGrp", h);
+            a.ad.h("noGrp", h);
         }
         if (c != false) {
             h = ST_OnOff.g(c);
-            a.ad.i("noDrilldown", h);
+            a.ad.h("noDrilldown", h);
         }
         if (d != false) {
             h = ST_OnOff.g(d);
-            a.ad.i("noSelect", h);
+            a.ad.h("noSelect", h);
         }
         if (e != false) {
             h = ST_OnOff.g(e);
-            a.ad.i("noChangeAspect", h);
+            a.ad.h("noChangeAspect", h);
         }
         if (f != false) {
             h = ST_OnOff.g(f);
-            a.ad.i("noMove", h);
+            a.ad.h("noMove", h);
         }
         if (g != false) {
             h = ST_OnOff.g(g);
-            a.ad.i("noResize", h);
+            a.ad.h("noResize", h);
         }
     };
-    DrawingMLMain.lw = function (a) {
+    DrawingMLMain.lu = function (a) {
     };
-    DrawingMLMain.oy = function (a) {
-        a.ad.q(DrawingMLMain.eo, "a");
+    DrawingMLMain.ov = function (a) {
+        a.ad.p(DrawingMLMain.eo, "a");
     };
-    DrawingMLMain.lx = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.eq, b);
+    DrawingMLMain.lv = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.eq, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.oz = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.eq, b);
+    DrawingMLMain.ow = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.eq, b);
     };
-    DrawingMLMain.ly = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.er, b);
+    DrawingMLMain.lw = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.er, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.o0 = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.er, b);
+    DrawingMLMain.ox = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.er, b);
     };
-    DrawingMLMain.lz = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.es, b);
+    DrawingMLMain.lx = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.es, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.o1 = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.es, b);
+    DrawingMLMain.oy = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.es, b);
     };
-    DrawingMLMain.l0 = function (a) {
+    DrawingMLMain.ly = function (a) {
     };
-    DrawingMLMain.o2 = function (a) {
-        a.ad.q(DrawingMLMain.et, "a");
+    DrawingMLMain.oz = function (a) {
+        a.ad.p(DrawingMLMain.et, "a");
     };
-    DrawingMLMain.l1 = function (a, b, c, d) {
-        var e = DrawingMLMain.k0(a, DrawingMLMain.ex, b, c, d);
+    DrawingMLMain.lz = function (a, b, c, d) {
+        var e = DrawingMLMain.kz(a, DrawingMLMain.ex, b, c, d);
         b = e.p2;
         c = e.p3;
         d = e.p4;
@@ -6054,10 +5966,10 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p3: d
         };
     };
-    DrawingMLMain.o3 = function (a, b, c, d) {
-        DrawingMLMain.n2(a, DrawingMLMain.ex, b, c, d);
+    DrawingMLMain.o0 = function (a, b, c, d) {
+        DrawingMLMain.n0(a, DrawingMLMain.ex, b, c, d);
     };
-    DrawingMLMain.l2 = function (a, b, c, d, e, f, g, h, i) {
+    DrawingMLMain.l0 = function (a, b, c, d, e, f, g, h, i) {
         var e_32, _0;
         b = null;
         c = "";
@@ -6123,7 +6035,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p8: i
         };
     };
-    DrawingMLMain.o4 = function (a, b, c, d, e, f, g, h, i) {
+    DrawingMLMain.o1 = function (a, b, c, d, e, f, g, h, i) {
         if (b === void 0) {
             b = null;
         }
@@ -6148,74 +6060,74 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
         if (i === void 0) {
             i = false;
         }
-        a.ad.q(DrawingMLMain.e3, "a");
+        a.ad.p(DrawingMLMain.e3, "a");
         var j;
         j = b;
-        a.ad.i(OfficeDocumentRelationships.as, j);
+        a.ad.h(OfficeDocumentRelationships.as, j);
         j = c;
-        a.ad.i("invalidUrl", j);
+        a.ad.h("invalidUrl", j);
         j = d;
-        a.ad.i("action", j);
+        a.ad.h("action", j);
         j = e;
-        a.ad.i("tgtFrame", j);
+        a.ad.h("tgtFrame", j);
         j = f;
-        a.ad.i("tooltip", j);
+        a.ad.h("tooltip", j);
         if (g != true) {
             j = ST_OnOff.g(g);
-            a.ad.i("history", j);
+            a.ad.h("history", j);
         }
         if (h != false) {
             j = ST_OnOff.g(h);
-            a.ad.i("highlightClick", j);
+            a.ad.h("highlightClick", j);
         }
         if (i != false) {
             j = ST_OnOff.g(i);
-            a.ad.i("endSnd", j);
+            a.ad.h("endSnd", j);
         }
     };
-    DrawingMLMain.l3 = function (a) {
+    DrawingMLMain.l1 = function (a) {
     };
-    DrawingMLMain.o5 = function (a) {
-        DrawingMLMain.n0(a, DrawingMLMain.e2);
+    DrawingMLMain.o2 = function (a) {
+        DrawingMLMain.ny(a, DrawingMLMain.e2);
     };
-    DrawingMLMain.l4 = function (a, b) {
-        var c = DrawingMLMain.k4(a, DrawingMLMain.e9, b);
+    DrawingMLMain.l2 = function (a, b) {
+        var c = DrawingMLMain.k3(a, DrawingMLMain.e9, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.o6 = function (a, b) {
-        DrawingMLMain.n6(a, DrawingMLMain.e9, b);
+    DrawingMLMain.o3 = function (a, b) {
+        DrawingMLMain.n4(a, DrawingMLMain.e9, b);
     };
-    DrawingMLMain.l5 = function (a, b) {
-        var c = DrawingMLMain.k6(a, DrawingMLMain.fa, b);
+    DrawingMLMain.l3 = function (a, b) {
+        var c = DrawingMLMain.k5(a, DrawingMLMain.fa, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.o7 = function (a, b) {
-        DrawingMLMain.n8(a, DrawingMLMain.fa, b);
+    DrawingMLMain.o4 = function (a, b) {
+        DrawingMLMain.n6(a, DrawingMLMain.fa, b);
     };
-    DrawingMLMain.l6 = function (a, b) {
-        var c = DrawingMLMain.kx(a, DrawingMLMain.fb, b);
+    DrawingMLMain.l4 = function (a, b) {
+        var c = DrawingMLMain.kw(a, DrawingMLMain.fb, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.o8 = function (a, b) {
-        DrawingMLMain.nz(a, DrawingMLMain.fb, b);
+    DrawingMLMain.o5 = function (a, b) {
+        DrawingMLMain.nx(a, DrawingMLMain.fb, b);
     };
-    DrawingMLMain.l7 = function (a) {
+    DrawingMLMain.l5 = function (a) {
     };
-    DrawingMLMain.o9 = function (a) {
-        a.ad.q(DrawingMLMain.fh, "a");
+    DrawingMLMain.o6 = function (a) {
+        a.ad.p(DrawingMLMain.fh, "a");
     };
-    DrawingMLMain.l8 = function (a, b, c, d, e) {
+    DrawingMLMain.l6 = function (a, b, c, d, e) {
         var f = toNullable(Number_$type, null);
-        var g = DrawingMLMain.la(a, DrawingMLMain.fr, b, c, d, f);
+        var g = DrawingMLMain.k9(a, DrawingMLMain.fr, b, c, d, f);
         b = g.p2;
         c = g.p3;
         d = g.p4;
@@ -6228,7 +6140,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    DrawingMLMain.pa = function (a, b, c, d, e) {
+    DrawingMLMain.o7 = function (a, b, c, d, e) {
         if (c === void 0) {
             c = null;
         }
@@ -6238,9 +6150,9 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
         if (e === void 0) {
             e = 1;
         }
-        DrawingMLMain.oc(a, DrawingMLMain.fr, b, c, d, e);
+        DrawingMLMain.oa(a, DrawingMLMain.fr, b, c, d, e);
     };
-    DrawingMLMain.l9 = function (a, b, c, d, e) {
+    DrawingMLMain.l7 = function (a, b, c, d, e) {
         var e_33, _0;
         b = toNullable(ST_LineWidth.$, null);
         c = toNullable(ST_LineCap_$type, null);
@@ -6286,103 +6198,103 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    DrawingMLMain.pb = function (a, b, c, d, e) {
-        a.ad.q(DrawingMLMain.fx, "a");
+    DrawingMLMain.o8 = function (a, b, c, d, e) {
+        a.ad.p(DrawingMLMain.fx, "a");
         var f;
         if (ST_LineWidth.j(b, toNullable(ST_LineWidth.$, null))) {
             f = b.toString();
-            a.ad.i("w", f);
+            a.ad.h("w", f);
         }
         if (nullableNotEquals(c, null)) {
             f = XmlNamespaceDefinitionBase.p(ST_LineCap_$type, c.value);
-            a.ad.i("cap", f);
+            a.ad.h("cap", f);
         }
         if (nullableNotEquals(d, null)) {
             f = XmlNamespaceDefinitionBase.p(ST_CompoundLine_$type, d.value);
-            a.ad.i("cmpd", f);
+            a.ad.h("cmpd", f);
         }
         if (nullableNotEquals(e, null)) {
             f = XmlNamespaceDefinitionBase.p(ST_PenAlignment_$type, e.value);
-            a.ad.i("algn", f);
+            a.ad.h("algn", f);
         }
     };
-    DrawingMLMain.ma = function (a, b) {
-        var c = DrawingMLMain.k9(a, DrawingMLMain.fy, b);
+    DrawingMLMain.l8 = function (a, b) {
+        var c = DrawingMLMain.k8(a, DrawingMLMain.fy, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.pc = function (a, b) {
-        DrawingMLMain.ob(a, DrawingMLMain.fy, b);
+    DrawingMLMain.o9 = function (a, b) {
+        DrawingMLMain.n9(a, DrawingMLMain.fy, b);
     };
-    DrawingMLMain.mb = function (a) {
+    DrawingMLMain.l9 = function (a) {
     };
-    DrawingMLMain.pd = function (a) {
-        a.ad.q(DrawingMLMain.f2, "a");
+    DrawingMLMain.pa = function (a) {
+        a.ad.p(DrawingMLMain.f2, "a");
     };
-    DrawingMLMain.mc = function (a) {
+    DrawingMLMain.ma = function (a) {
     };
-    DrawingMLMain.pe = function (a) {
-        DrawingMLMain.n0(a, DrawingMLMain.f3);
+    DrawingMLMain.pb = function (a) {
+        DrawingMLMain.ny(a, DrawingMLMain.f3);
     };
-    DrawingMLMain.md = function (a) {
+    DrawingMLMain.mb = function (a) {
     };
-    DrawingMLMain.pf = function (a) {
-        DrawingMLMain.n0(a, DrawingMLMain.f4);
+    DrawingMLMain.pc = function (a) {
+        DrawingMLMain.ny(a, DrawingMLMain.f4);
     };
-    DrawingMLMain.me = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.f5, b);
+    DrawingMLMain.mc = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.f5, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.pg = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.f5, b);
+    DrawingMLMain.pd = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.f5, b);
     };
-    DrawingMLMain.mf = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.f6, b);
+    DrawingMLMain.md = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.f6, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.ph = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.f6, b);
+    DrawingMLMain.pe = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.f6, b);
     };
-    DrawingMLMain.mg = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.f7, b);
+    DrawingMLMain.me = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.f7, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.pi = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.f7, b);
+    DrawingMLMain.pf = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.f7, b);
     };
-    DrawingMLMain.mh = function (a) {
+    DrawingMLMain.mf = function (a) {
     };
-    DrawingMLMain.pj = function (a) {
-        a.ad.q(DrawingMLMain.gi, "a");
+    DrawingMLMain.pg = function (a) {
+        a.ad.p(DrawingMLMain.gi, "a");
     };
-    DrawingMLMain.mi = function (a) {
+    DrawingMLMain.mg = function (a) {
     };
-    DrawingMLMain.pk = function (a) {
-        a.ad.q(DrawingMLMain.gl, "a");
+    DrawingMLMain.ph = function (a) {
+        a.ad.p(DrawingMLMain.gl, "a");
     };
-    DrawingMLMain.mj = function (a) {
+    DrawingMLMain.mh = function (a) {
     };
-    DrawingMLMain.pl = function (a) {
-        a.ad.q(DrawingMLMain.gz, "a");
+    DrawingMLMain.pi = function (a) {
+        a.ad.p(DrawingMLMain.gz, "a");
     };
-    DrawingMLMain.mk = function (a) {
+    DrawingMLMain.mi = function (a) {
     };
-    DrawingMLMain.pm = function (a) {
-        a.ad.q(DrawingMLMain.hb, "a");
+    DrawingMLMain.pj = function (a) {
+        a.ad.p(DrawingMLMain.hb, "a");
     };
-    DrawingMLMain.ml = function (a, b, c) {
-        var d = DrawingMLMain.k3(a, DrawingMLMain.hc, b, c);
+    DrawingMLMain.mj = function (a, b, c) {
+        var d = DrawingMLMain.k2(a, DrawingMLMain.hc, b, c);
         b = d.p2;
         c = d.p3;
         return {
@@ -6390,15 +6302,15 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.pn = function (a, b, c) {
-        DrawingMLMain.n5(a, DrawingMLMain.hc, b, c);
+    DrawingMLMain.pk = function (a, b, c) {
+        DrawingMLMain.n3(a, DrawingMLMain.hc, b, c);
     };
-    DrawingMLMain.mm = function (a) {
+    DrawingMLMain.mk = function (a) {
     };
-    DrawingMLMain.po = function (a) {
-        a.ad.q(DrawingMLMain.he, "a");
+    DrawingMLMain.pl = function (a) {
+        a.ad.p(DrawingMLMain.he, "a");
     };
-    DrawingMLMain.mn = function (a, b, c, d, e, f, g, h, i, j, k, l) {
+    DrawingMLMain.ml = function (a, b, c, d, e, f, g, h, i, j, k, l) {
         var e_34, _0;
         b = false;
         c = false;
@@ -6479,7 +6391,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p11: l
         };
     };
-    DrawingMLMain.pp = function (a, b, c, d, e, f, g, h, i, j, k, l) {
+    DrawingMLMain.pm = function (a, b, c, d, e, f, g, h, i, j, k, l) {
         if (b === void 0) {
             b = false;
         }
@@ -6513,54 +6425,54 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
         if (l === void 0) {
             l = false;
         }
-        a.ad.q(DrawingMLMain.hj, "a");
+        a.ad.p(DrawingMLMain.hj, "a");
         var m;
         if (b != false) {
             m = ST_OnOff.g(b);
-            a.ad.i("noGrp", m);
+            a.ad.h("noGrp", m);
         }
         if (c != false) {
             m = ST_OnOff.g(c);
-            a.ad.i("noSelect", m);
+            a.ad.h("noSelect", m);
         }
         if (d != false) {
             m = ST_OnOff.g(d);
-            a.ad.i("noRot", m);
+            a.ad.h("noRot", m);
         }
         if (e != false) {
             m = ST_OnOff.g(e);
-            a.ad.i("noChangeAspect", m);
+            a.ad.h("noChangeAspect", m);
         }
         if (f != false) {
             m = ST_OnOff.g(f);
-            a.ad.i("noMove", m);
+            a.ad.h("noMove", m);
         }
         if (g != false) {
             m = ST_OnOff.g(g);
-            a.ad.i("noResize", m);
+            a.ad.h("noResize", m);
         }
         if (h != false) {
             m = ST_OnOff.g(h);
-            a.ad.i("noEditPoints", m);
+            a.ad.h("noEditPoints", m);
         }
         if (i != false) {
             m = ST_OnOff.g(i);
-            a.ad.i("noAdjustHandles", m);
+            a.ad.h("noAdjustHandles", m);
         }
         if (j != false) {
             m = ST_OnOff.g(j);
-            a.ad.i("noChangeArrowheads", m);
+            a.ad.h("noChangeArrowheads", m);
         }
         if (k != false) {
             m = ST_OnOff.g(k);
-            a.ad.i("noChangeShapeType", m);
+            a.ad.h("noChangeShapeType", m);
         }
         if (l != false) {
             m = ST_OnOff.g(l);
-            a.ad.i("noCrop", m);
+            a.ad.h("noCrop", m);
         }
     };
-    DrawingMLMain.mo = function (a, b, c, d, e, f, g, h, i, j, k, l) {
+    DrawingMLMain.mm = function (a, b, c, d, e, f, g, h, i, j, k, l) {
         var e_35, _0;
         b = toNullable(ST_TextMargin.$, null);
         c = toNullable(ST_TextMargin.$, null);
@@ -6641,7 +6553,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p11: l
         };
     };
-    DrawingMLMain.pq = function (a, b, c, d, e, f, g, h, i, j, k, l) {
+    DrawingMLMain.pn = function (a, b, c, d, e, f, g, h, i, j, k, l) {
         if (b === void 0) {
             b = toNullable(ST_TextMargin.$, null);
         }
@@ -6675,54 +6587,54 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
         if (l === void 0) {
             l = toNullable(Boolean_$type, null);
         }
-        a.ad.q(DrawingMLMain.hm, "a");
+        a.ad.p(DrawingMLMain.hm, "a");
         var m;
         if (nullableNotEquals(b, null)) {
             m = b.value.toString();
-            a.ad.i("marL", m);
+            a.ad.h("marL", m);
         }
         if (nullableNotEquals(c, null)) {
             m = c.value.toString();
-            a.ad.i("marR", m);
+            a.ad.h("marR", m);
         }
         if (nullableNotEquals(d, null)) {
             m = d.value.toString();
-            a.ad.i("lvl", m);
+            a.ad.h("lvl", m);
         }
         if (nullableNotEquals(e, null)) {
             m = e.value.toString();
-            a.ad.i("indent", m);
+            a.ad.h("indent", m);
         }
         if (nullableNotEquals(f, null)) {
             m = XmlNamespaceDefinitionBase.p(ST_TextAlignType_$type, f.value);
-            a.ad.i("algn", m);
+            a.ad.h("algn", m);
         }
         if (nullableNotEquals(g, null)) {
             m = g.value.toString();
-            a.ad.i("defTabSz", m);
+            a.ad.h("defTabSz", m);
         }
         if (nullableNotEquals(h, null)) {
             m = ST_OnOff.g(h.value);
-            a.ad.i("rtl", m);
+            a.ad.h("rtl", m);
         }
         if (nullableNotEquals(i, null)) {
             m = ST_OnOff.g(i.value);
-            a.ad.i("eaLnBrk", m);
+            a.ad.h("eaLnBrk", m);
         }
         if (nullableNotEquals(j, null)) {
             m = XmlNamespaceDefinitionBase.p(ST_TextFontAlignType_$type, j.value);
-            a.ad.i("fontAlgn", m);
+            a.ad.h("fontAlgn", m);
         }
         if (nullableNotEquals(k, null)) {
             m = ST_OnOff.g(k.value);
-            a.ad.i("latinLnBrk", m);
+            a.ad.h("latinLnBrk", m);
         }
         if (nullableNotEquals(l, null)) {
             m = ST_OnOff.g(l.value);
-            a.ad.i("hangingPunct", m);
+            a.ad.h("hangingPunct", m);
         }
     };
-    DrawingMLMain.mp = function (a, b) {
+    DrawingMLMain.mn = function (a, b) {
         b = 7;
         var c = a.ao("val");
         if (c != null) {
@@ -6732,13 +6644,13 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p1: b
         };
     };
-    DrawingMLMain.pr = function (a, b) {
-        a.ad.q(DrawingMLMain.ho, "a");
+    DrawingMLMain.po = function (a, b) {
+        a.ad.p(DrawingMLMain.ho, "a");
         var c;
         c = XmlNamespaceDefinitionBase.p(ST_PresetColorVal_$type, b);
-        a.ad.i("val", c);
+        a.ad.h("val", c);
     };
-    DrawingMLMain.mq = function (a, b) {
+    DrawingMLMain.mo = function (a, b) {
         var c = a.ao("prst");
         b = 0;
         if (c != null) {
@@ -6748,48 +6660,48 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p1: b
         };
     };
-    DrawingMLMain.ps = function (a, b) {
-        a.ad.q(DrawingMLMain.hq, "a");
+    DrawingMLMain.pp = function (a, b) {
+        a.ad.p(DrawingMLMain.hq, "a");
         var c;
         c = XmlNamespaceDefinitionBase.p(ST_ShapeType_$type, b);
-        a.ad.i("prst", c);
+        a.ad.h("prst", c);
     };
-    DrawingMLMain.mr = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.hy, b);
+    DrawingMLMain.mp = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.hy, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.pt = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.hy, b);
+    DrawingMLMain.pq = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.hy, b);
     };
-    DrawingMLMain.ms = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.hz, b);
+    DrawingMLMain.mq = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.hz, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.pu = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.hz, b);
+    DrawingMLMain.pr = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.hz, b);
     };
-    DrawingMLMain.mt = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.h0, b);
+    DrawingMLMain.mr = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.h0, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.pv = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.h0, b);
+    DrawingMLMain.ps = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.h0, b);
     };
-    DrawingMLMain.mu = function (a) {
+    DrawingMLMain.ms = function (a) {
     };
-    DrawingMLMain.pw = function (a) {
-        a.ad.q(DrawingMLMain.hv, "a");
+    DrawingMLMain.pt = function (a) {
+        a.ad.p(DrawingMLMain.hv, "a");
     };
-    DrawingMLMain.mv = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) {
+    DrawingMLMain.mt = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) {
         var e_36, _0;
         if (u === void 0) {
             u = DrawingMLMain.h8;
@@ -6934,7 +6846,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p19: t
         };
     };
-    DrawingMLMain.px = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) {
+    DrawingMLMain.pu = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) {
         if (b === void 0) {
             b = toNullable(Boolean_$type, null);
         }
@@ -6992,110 +6904,110 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
         if (t === void 0) {
             t = null;
         }
-        a.ad.q(DrawingMLMain.h8, "a");
+        a.ad.p(DrawingMLMain.h8, "a");
         var u;
         if (nullableNotEquals(b, null)) {
             u = ST_OnOff.g(b.value);
-            a.ad.i("kumimoji", u);
+            a.ad.h("kumimoji", u);
         }
         u = c;
-        a.ad.i("lang", u);
+        a.ad.h("lang", u);
         u = d;
-        a.ad.i("altLang", u);
+        a.ad.h("altLang", u);
         if (nullableNotEquals(e, null)) {
             u = e.value.toString();
-            a.ad.i("sz", u);
+            a.ad.h("sz", u);
         }
         if (nullableNotEquals(f, null)) {
             u = ST_OnOff.g(f.value);
-            a.ad.i("b", u);
+            a.ad.h("b", u);
         }
         if (nullableNotEquals(g, null)) {
             u = ST_OnOff.g(g.value);
-            a.ad.i("i", u);
+            a.ad.h("i", u);
         }
         if (nullableNotEquals(h, null)) {
             u = XmlNamespaceDefinitionBase.p(ST_TextUnderlineType_$type, h.value);
-            a.ad.i("u", u);
+            a.ad.h("u", u);
         }
         if (nullableNotEquals(i, null)) {
             u = XmlNamespaceDefinitionBase.p(ST_TextStrikeType_$type, i.value);
-            a.ad.i("strike", u);
+            a.ad.h("strike", u);
         }
         if (nullableNotEquals(j, null)) {
             u = j.value.toString();
-            a.ad.i("kern", u);
+            a.ad.h("kern", u);
         }
         if (nullableNotEquals(k, null)) {
             u = XmlNamespaceDefinitionBase.p(ST_TextCapsType_$type, k.value);
-            a.ad.i("cap", u);
+            a.ad.h("cap", u);
         }
         if (nullableNotEquals(l, null)) {
             u = l.value.toString();
-            a.ad.i("spc", u);
+            a.ad.h("spc", u);
         }
         if (nullableNotEquals(m, null)) {
             u = ST_OnOff.g(m.value);
-            a.ad.i("normalizeH", u);
+            a.ad.h("normalizeH", u);
         }
         if (ST_Percentage.h(n, toNullable(ST_Percentage.$, null))) {
             u = n.value.r(a.d._ab);
-            a.ad.i("baseline", u);
+            a.ad.h("baseline", u);
         }
         if (nullableNotEquals(o, null)) {
             u = ST_OnOff.g(o.value);
-            a.ad.i("noProof", u);
+            a.ad.h("noProof", u);
         }
         if (p.hasValue && nullableNotEquals(p, true)) {
             u = ST_OnOff.g(p.value);
-            a.ad.i("dirty", u);
+            a.ad.h("dirty", u);
         }
         if (q.hasValue && nullableNotEquals(q, false)) {
             u = ST_OnOff.g(q.value);
-            a.ad.i("err", u);
+            a.ad.h("err", u);
         }
         if (r.hasValue && nullableNotEquals(r, true)) {
             u = ST_OnOff.g(r.value);
-            a.ad.i("smtClean", u);
+            a.ad.h("smtClean", u);
         }
         if (s.hasValue && nullableNotEquals(s, 0)) {
             u = s.value.toString();
-            a.ad.i("smtId", u);
+            a.ad.h("smtId", u);
         }
         u = t;
-        a.ad.i("bmk", u);
+        a.ad.h("bmk", u);
     };
-    DrawingMLMain.mw = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.ib, b);
+    DrawingMLMain.mu = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.ib, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.py = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.ib, b);
+    DrawingMLMain.pv = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.ib, b);
     };
-    DrawingMLMain.mx = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.ic, b);
+    DrawingMLMain.mv = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.ic, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.pz = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.ic, b);
+    DrawingMLMain.pw = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.ic, b);
     };
-    DrawingMLMain.my = function (a, b) {
-        var c = DrawingMLMain.k2(a, DrawingMLMain.id, b);
+    DrawingMLMain.mw = function (a, b) {
+        var c = DrawingMLMain.k1(a, DrawingMLMain.id, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.p0 = function (a, b) {
-        DrawingMLMain.n4(a, DrawingMLMain.id, b);
+    DrawingMLMain.px = function (a, b) {
+        DrawingMLMain.n2(a, DrawingMLMain.id, b);
     };
-    DrawingMLMain.mz = function (a, b) {
+    DrawingMLMain.mx = function (a, b) {
         var c = a.ao("val");
         if (c == null) {
             b = 0;
@@ -7107,28 +7019,28 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p1: b
         };
     };
-    DrawingMLMain.p1 = function (a, b) {
-        a.ad.q(DrawingMLMain.ig, "a");
+    DrawingMLMain.py = function (a, b) {
+        a.ad.p(DrawingMLMain.ig, "a");
         var c;
         c = XmlNamespaceDefinitionBase.p(ST_SchemeColorVal_$type, b);
-        a.ad.i("val", c);
+        a.ad.h("val", c);
     };
-    DrawingMLMain.m0 = function (a, b) {
-        var c = DrawingMLMain.k5(a, DrawingMLMain.ij, b);
+    DrawingMLMain.my = function (a, b) {
+        var c = DrawingMLMain.k4(a, DrawingMLMain.ij, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.p2 = function (a, b) {
-        DrawingMLMain.n7(a, DrawingMLMain.ij, b);
+    DrawingMLMain.pz = function (a, b) {
+        DrawingMLMain.n5(a, DrawingMLMain.ij, b);
     };
-    DrawingMLMain.m1 = function (a) {
+    DrawingMLMain.mz = function (a) {
     };
-    DrawingMLMain.p3 = function (a) {
-        a.ad.q(DrawingMLMain.ip, "a");
+    DrawingMLMain.p0 = function (a) {
+        a.ad.p(DrawingMLMain.ip, "a");
     };
-    DrawingMLMain.m2 = function (a, b, c, d, e, f, g, h, i, j, k, l) {
+    DrawingMLMain.m0 = function (a, b, c, d, e, f, g, h, i, j, k, l) {
         var e_37, _0;
         b = false;
         c = false;
@@ -7209,7 +7121,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p11: l
         };
     };
-    DrawingMLMain.p4 = function (a, b, c, d, e, f, g, h, i, j, k, l) {
+    DrawingMLMain.p1 = function (a, b, c, d, e, f, g, h, i, j, k, l) {
         if (b === void 0) {
             b = false;
         }
@@ -7243,55 +7155,55 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
         if (l === void 0) {
             l = false;
         }
-        a.ad.q(DrawingMLMain.iz, "a");
+        a.ad.p(DrawingMLMain.iz, "a");
         var m;
         if (b != false) {
             m = ST_OnOff.g(b);
-            a.ad.i("noGrp", m);
+            a.ad.h("noGrp", m);
         }
         if (c != false) {
             m = ST_OnOff.g(c);
-            a.ad.i("noSelect", m);
+            a.ad.h("noSelect", m);
         }
         if (d != false) {
             m = ST_OnOff.g(d);
-            a.ad.i("noRot", m);
+            a.ad.h("noRot", m);
         }
         if (e != false) {
             m = ST_OnOff.g(e);
-            a.ad.i("noChangeAspect", m);
+            a.ad.h("noChangeAspect", m);
         }
         if (f != false) {
             m = ST_OnOff.g(f);
-            a.ad.i("noMove", m);
+            a.ad.h("noMove", m);
         }
         if (g != false) {
             m = ST_OnOff.g(g);
-            a.ad.i("noResize", m);
+            a.ad.h("noResize", m);
         }
         if (h != false) {
             m = ST_OnOff.g(h);
-            a.ad.i("noEditPoints", m);
+            a.ad.h("noEditPoints", m);
         }
         if (i != false) {
             m = ST_OnOff.g(i);
-            a.ad.i("noAdjustHandles", m);
+            a.ad.h("noAdjustHandles", m);
         }
         if (j != false) {
             m = ST_OnOff.g(j);
-            a.ad.i("noChangeArrowheads", m);
+            a.ad.h("noChangeArrowheads", m);
         }
         if (k != false) {
             m = ST_OnOff.g(k);
-            a.ad.i("noChangeShapeType", m);
+            a.ad.h("noChangeShapeType", m);
         }
         if (l != false) {
             m = ST_OnOff.g(l);
-            a.ad.i("noTextEdit", m);
+            a.ad.h("noTextEdit", m);
         }
     };
-    DrawingMLMain.m3 = function (a, b, c, d, e) {
-        var f = DrawingMLMain.k8(a, DrawingMLMain.i0, b, c, d, e);
+    DrawingMLMain.m1 = function (a, b, c, d, e) {
+        var f = DrawingMLMain.k7(a, DrawingMLMain.i0, b, c, d, e);
         b = f.p2;
         c = f.p3;
         d = f.p4;
@@ -7303,10 +7215,10 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    DrawingMLMain.p5 = function (a, b, c, d, e) {
-        DrawingMLMain.oa(a, DrawingMLMain.i0, b, c, d, e);
+    DrawingMLMain.p2 = function (a, b, c, d, e) {
+        DrawingMLMain.n8(a, DrawingMLMain.i0, b, c, d, e);
     };
-    DrawingMLMain.m4 = function (a, b) {
+    DrawingMLMain.m2 = function (a, b) {
         var c = a.ao("val");
         if (c == null) {
             b = ST_HexColorRGB.a;
@@ -7318,18 +7230,18 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p1: b
         };
     };
-    DrawingMLMain.p6 = function (a, b) {
-        a.ad.q(DrawingMLMain.i1, "a");
+    DrawingMLMain.p3 = function (a, b) {
+        a.ad.p(DrawingMLMain.i1, "a");
         var c;
         c = b.toString();
-        a.ad.i("val", c);
+        a.ad.h("val", c);
     };
-    DrawingMLMain.m5 = function (a) {
+    DrawingMLMain.m3 = function (a) {
     };
-    DrawingMLMain.p7 = function (a) {
-        a.ad.q(DrawingMLMain.i3, "a");
+    DrawingMLMain.p4 = function (a) {
+        a.ad.p(DrawingMLMain.i3, "a");
     };
-    DrawingMLMain.m6 = function (a, b, c) {
+    DrawingMLMain.m4 = function (a, b, c) {
         var e_38, _0;
         b = 0;
         c = ST_HexColorRGB.a;
@@ -7365,16 +7277,16 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    DrawingMLMain.p8 = function (a, b, c) {
-        a.ad.q(DrawingMLMain.i9, "a");
+    DrawingMLMain.p5 = function (a, b, c) {
+        a.ad.p(DrawingMLMain.i9, "a");
         var d;
         d = XmlNamespaceDefinitionBase.p(ST_SystemColorVal_$type, b);
-        a.ad.i("val", d);
+        a.ad.h("val", d);
         d = c.toString();
-        a.ad.i("lastClr", d);
+        a.ad.h("lastClr", d);
     };
-    DrawingMLMain.m7 = function (a, b, c, d) {
-        var e = DrawingMLMain.k0(a, DrawingMLMain.jf, b, c, d);
+    DrawingMLMain.m5 = function (a, b, c, d) {
+        var e = DrawingMLMain.kz(a, DrawingMLMain.jf, b, c, d);
         b = e.p2;
         c = e.p3;
         d = e.p4;
@@ -7384,52 +7296,52 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p3: d
         };
     };
-    DrawingMLMain.p9 = function (a, b, c, d) {
-        DrawingMLMain.n2(a, DrawingMLMain.jf, b, c, d);
+    DrawingMLMain.p6 = function (a, b, c, d) {
+        DrawingMLMain.n0(a, DrawingMLMain.jf, b, c, d);
     };
-    DrawingMLMain.m8 = function (a, b) {
+    DrawingMLMain.m6 = function (a, b) {
         b = XmlNamespaceDefinitionBase.u(a, DrawingMLMain.jb, 6);
         return {
             p1: b
         };
     };
-    DrawingMLMain.qa = function (a, b) {
+    DrawingMLMain.p7 = function (a, b) {
         XmlNamespaceDefinitionBase.aj(a, DrawingMLMain.jb, "a", b, void 0, 6);
     };
-    DrawingMLMain.m9 = function (a, b) {
+    DrawingMLMain.m7 = function (a, b) {
         b = a.ao("name");
         return {
             p1: b
         };
     };
-    DrawingMLMain.qb = function (a, b) {
-        a.ad.q(DrawingMLMain.jh, "a");
+    DrawingMLMain.p8 = function (a, b) {
+        a.ad.p(DrawingMLMain.jh, "a");
         var c;
         c = b;
-        a.ad.i("name", c);
-        a.ad.m(IGOfficeExtensions.ao, true);
+        a.ad.h("name", c);
+        a.ad.l(IGOfficeExtensions.ao, true);
     };
-    DrawingMLMain.na = function (a) {
+    DrawingMLMain.m8 = function (a) {
     };
-    DrawingMLMain.qc = function (a) {
-        a.ad.q(DrawingMLMain.ji, "a");
+    DrawingMLMain.p9 = function (a) {
+        a.ad.p(DrawingMLMain.ji, "a");
     };
-    DrawingMLMain.nb = function (a) {
+    DrawingMLMain.m9 = function (a) {
     };
-    DrawingMLMain.qd = function (a) {
-        a.ad.q(DrawingMLMain.jj, "a");
+    DrawingMLMain.qa = function (a) {
+        a.ad.p(DrawingMLMain.jj, "a");
     };
-    DrawingMLMain.nc = function (a, b) {
-        var c = DrawingMLMain.k5(a, DrawingMLMain.jn, b);
+    DrawingMLMain.na = function (a, b) {
+        var c = DrawingMLMain.k4(a, DrawingMLMain.jn, b);
         b = c.p2;
         return {
             p1: b
         };
     };
-    DrawingMLMain.qe = function (a, b) {
-        DrawingMLMain.n7(a, DrawingMLMain.jn, b);
+    DrawingMLMain.qb = function (a, b) {
+        DrawingMLMain.n5(a, DrawingMLMain.jn, b);
     };
-    DrawingMLMain.nd = function (a, b, c, d) {
+    DrawingMLMain.nb = function (a, b, c, d) {
         var e_39, _0;
         b = ST_Angle.a(0);
         c = false;
@@ -7470,7 +7382,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
             p3: d
         };
     };
-    DrawingMLMain.qf = function (a, b, c, d) {
+    DrawingMLMain.qc = function (a, b, c, d) {
         if (b === void 0) {
             b = new ST_Angle();
         }
@@ -7480,19 +7392,19 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
         if (d === void 0) {
             d = false;
         }
-        a.ad.q(DrawingMLMain.ka, "a");
+        a.ad.p(DrawingMLMain.j9, "a");
         var e;
         if (b.n() != 0) {
             e = b.toString();
-            a.ad.i("rot", e);
+            a.ad.h("rot", e);
         }
         if (c != false) {
             e = ST_OnOff.g(c);
-            a.ad.i("flipH", e);
+            a.ad.h("flipH", e);
         }
         if (d != false) {
             e = ST_OnOff.g(d);
-            a.ad.i("flipV", e);
+            a.ad.h("flipV", e);
         }
     };
     DrawingMLMain.$t = markType(DrawingMLMain, 'DrawingMLMain', XmlNamespaceDefinitionBase.$);
@@ -7603,7 +7515,7 @@ export var DrawingMLMain = /** @class */ /*@__PURE__*/ (function (_super) {
     DrawingMLMain.ji = DrawingMLMain.gp + "/themeElements";
     DrawingMLMain.jj = DrawingMLMain.gp + "/themeManager";
     DrawingMLMain.jn = DrawingMLMain.gp + "/tint";
-    DrawingMLMain.ka = DrawingMLMain.gp + "/xfrm";
+    DrawingMLMain.j9 = DrawingMLMain.gp + "/xfrm";
     DrawingMLMain.gs = DrawingMLMain.gp + "/noAutofit";
     DrawingMLMain.g6 = DrawingMLMain.gp + "/normAutofit";
     DrawingMLMain.hs = DrawingMLMain.gp + "/prstTxWarp";
@@ -7843,22 +7755,22 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (d === void 0) {
             d = 0;
         }
-        a.ad.q(b, this.t);
+        a.ad.p(b, this.t);
         var e;
         if (c != 0) {
             e = c.toString();
-            a.ad.i("id", e);
+            a.ad.h("id", e);
         }
         if (d != 0) {
             e = d.toString();
-            a.ad.i("idx", e);
+            a.ad.h("idx", e);
         }
     };
     DrawingNamespaceDefinitionBase.db = function (a, b) {
         if (stringIsNullOrEmpty(b)) {
             return;
         }
-        a.ad.i("macro", b);
+        a.ad.h("macro", b);
     };
     DrawingNamespaceDefinitionBase.prototype.b5 = function (a, b, c) {
         var e_41, _0;
@@ -7897,31 +7809,31 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         };
     };
     DrawingNamespaceDefinitionBase.prototype.cw = function (a, b, c) {
-        a.ad.q(this.ao, this.t);
+        a.ad.p(this.ao, this.t);
         var d;
         if (nullableNotEquals(b, null)) {
             d = b.value.toString();
-            a.ad.i("dpi", d);
+            a.ad.h("dpi", d);
         }
         if (nullableNotEquals(c, null)) {
             d = ST_OnOff.g(c.value);
-            a.ad.i("rotWithShape", d);
+            a.ad.h("rotWithShape", d);
         }
     };
     DrawingNamespaceDefinitionBase.prototype.b6 = function (a) {
     };
     DrawingNamespaceDefinitionBase.prototype.cx = function (a) {
-        a.ad.q(this.aq, this.t);
+        a.ad.p(this.aq, this.t);
     };
     DrawingNamespaceDefinitionBase.prototype.b7 = function (a) {
     };
     DrawingNamespaceDefinitionBase.prototype.cy = function (a) {
-        a.ad.q(this.ar, this.t);
+        a.ad.p(this.ar, this.t);
     };
     DrawingNamespaceDefinitionBase.prototype.b8 = function (a) {
     };
     DrawingNamespaceDefinitionBase.prototype.cz = function (a) {
-        a.ad.q(this.as, this.t);
+        a.ad.p(this.as, this.t);
     };
     DrawingNamespaceDefinitionBase.prototype.b9 = function (a, b) {
         var c = a.ao("preferRelativeResize");
@@ -7939,15 +7851,15 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (b === void 0) {
             b = true;
         }
-        a.ad.q(this.at, this.t);
+        a.ad.p(this.at, this.t);
         var c;
         if (b != true) {
             c = ST_OnOff.g(b);
-            a.ad.i("preferRelativeResize", c);
+            a.ad.h("preferRelativeResize", c);
         }
     };
     DrawingNamespaceDefinitionBase.prototype.ca = function (a, b, c, d, e, f) {
-        var g = DrawingMLMain.k1(a, this.au, b, c, d, e, f);
+        var g = DrawingMLMain.k0(a, this.au, b, c, d, e, f);
         b = g.p2;
         c = g.p3;
         d = g.p4;
@@ -7971,7 +7883,7 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (f === void 0) {
             f = null;
         }
-        DrawingMLMain.n3(a, this.au, b, c, d, e, f);
+        DrawingMLMain.n1(a, this.au, b, c, d, e, f);
     };
     DrawingNamespaceDefinitionBase.prototype.cb = function (a, b) {
         var c = a.ao("txBox");
@@ -7989,11 +7901,11 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (b === void 0) {
             b = false;
         }
-        a.ad.q(this.av, this.t);
+        a.ad.p(this.av, this.t);
         var c;
         if (b != false) {
             c = ST_OnOff.g(b);
-            a.ad.i("txBox", c);
+            a.ad.h("txBox", c);
         }
     };
     DrawingNamespaceDefinitionBase.prototype.cd = function (a, b, c) {
@@ -8039,13 +7951,13 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (c === void 0) {
             c = false;
         }
-        a.ad.q(this.aw, this.t);
+        a.ad.p(this.aw, this.t);
         var d;
         d = b;
         DrawingNamespaceDefinitionBase.db(a, d);
         if (c != false) {
             d = ST_OnOff.g(c);
-            a.ad.i("fPublished", d);
+            a.ad.h("fPublished", d);
         }
     };
     DrawingNamespaceDefinitionBase.prototype.ce = function (a, b, c, d, e, f, g, h, i, j, k) {
@@ -8155,47 +8067,47 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (k === void 0) {
             k = false;
         }
-        a.ad.q(this.ax, this.t);
+        a.ad.p(this.ax, this.t);
         var l;
         if (b != false) {
             l = ST_OnOff.g(b);
-            a.ad.i("noGrp", l);
+            a.ad.h("noGrp", l);
         }
         if (c != false) {
             l = ST_OnOff.g(c);
-            a.ad.i("noSelect", l);
+            a.ad.h("noSelect", l);
         }
         if (d != false) {
             l = ST_OnOff.g(d);
-            a.ad.i("noRot", l);
+            a.ad.h("noRot", l);
         }
         if (e != false) {
             l = ST_OnOff.g(e);
-            a.ad.i("noChangeAspect", l);
+            a.ad.h("noChangeAspect", l);
         }
         if (f != false) {
             l = ST_OnOff.g(f);
-            a.ad.i("noMove", l);
+            a.ad.h("noMove", l);
         }
         if (g != false) {
             l = ST_OnOff.g(g);
-            a.ad.i("noResize", l);
+            a.ad.h("noResize", l);
         }
         if (h != false) {
             l = ST_OnOff.g(h);
-            a.ad.i("noEditPoints", l);
+            a.ad.h("noEditPoints", l);
         }
         if (i != false) {
             l = ST_OnOff.g(i);
-            a.ad.i("noAdjustHandles", l);
+            a.ad.h("noAdjustHandles", l);
         }
         if (j != false) {
             l = ST_OnOff.g(j);
-            a.ad.i("noChangeArrowheads", l);
+            a.ad.h("noChangeArrowheads", l);
         }
         if (k != false) {
             l = ST_OnOff.g(k);
-            a.ad.i("noChangeShapeType", l);
+            a.ad.h("noChangeShapeType", l);
         }
     };
     DrawingNamespaceDefinitionBase.prototype.cf = function (a, b, c) {
@@ -8259,19 +8171,19 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (c === void 0) {
             c = false;
         }
-        a.ad.q(this.a4, this.t);
+        a.ad.p(this.a4, this.t);
         var d;
         d = b;
         DrawingNamespaceDefinitionBase.db(a, d);
         if (c != false) {
             d = ST_OnOff.g(c);
-            a.ad.i("fPublished", d);
+            a.ad.h("fPublished", d);
         }
     };
     DrawingNamespaceDefinitionBase.prototype.ch = function (a) {
     };
     DrawingNamespaceDefinitionBase.prototype.c8 = function (a) {
-        a.ad.q(this.a5, this.t);
+        a.ad.p(this.a5, this.t);
     };
     DrawingNamespaceDefinitionBase.prototype.ci = function (a, b, c, d, e, f, g, h) {
         var e_45, _0;
@@ -8356,35 +8268,35 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (h === void 0) {
             h = false;
         }
-        a.ad.q(this.a6, this.t);
+        a.ad.p(this.a6, this.t);
         var i;
         if (b != false) {
             i = ST_OnOff.g(b);
-            a.ad.i("noGrp", i);
+            a.ad.h("noGrp", i);
         }
         if (c != false) {
             i = ST_OnOff.g(c);
-            a.ad.i("noUngrp", i);
+            a.ad.h("noUngrp", i);
         }
         if (d != false) {
             i = ST_OnOff.g(d);
-            a.ad.i("noSelect", i);
+            a.ad.h("noSelect", i);
         }
         if (e != false) {
             i = ST_OnOff.g(e);
-            a.ad.i("noRot", i);
+            a.ad.h("noRot", i);
         }
         if (f != false) {
             i = ST_OnOff.g(f);
-            a.ad.i("noChangeAspect", i);
+            a.ad.h("noChangeAspect", i);
         }
         if (g != false) {
             i = ST_OnOff.g(g);
-            a.ad.i("noMove", i);
+            a.ad.h("noMove", i);
         }
         if (h != false) {
             i = ST_OnOff.g(h);
-            a.ad.i("noResize", i);
+            a.ad.h("noResize", i);
         }
     };
     DrawingNamespaceDefinitionBase.prototype.cj = function (a, b) {
@@ -8403,37 +8315,37 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (b === void 0) {
             b = toNullable(ST_BlackWhiteMode_$type, null);
         }
-        a.ad.q(this.a7, this.t);
+        a.ad.p(this.a7, this.t);
         var c;
         if (nullableNotEquals(b, null)) {
             c = XmlNamespaceDefinitionBase.p(ST_BlackWhiteMode_$type, b.value);
-            a.ad.i("bwMode", c);
+            a.ad.h("bwMode", c);
         }
     };
     DrawingNamespaceDefinitionBase.prototype.ck = function (a) {
     };
     DrawingNamespaceDefinitionBase.prototype.dc = function (a) {
-        a.ad.q(this.bo, this.t);
+        a.ad.p(this.bo, this.t);
     };
     DrawingNamespaceDefinitionBase.prototype.cl = function (a) {
     };
     DrawingNamespaceDefinitionBase.prototype.dd = function (a) {
-        a.ad.q(this.bp, this.t);
+        a.ad.p(this.bp, this.t);
     };
     DrawingNamespaceDefinitionBase.prototype.cm = function (a) {
     };
     DrawingNamespaceDefinitionBase.prototype.de = function (a) {
-        a.ad.q(this.bq, this.t);
+        a.ad.p(this.bq, this.t);
     };
     DrawingNamespaceDefinitionBase.prototype.cn = function (a) {
     };
     DrawingNamespaceDefinitionBase.prototype.df = function (a) {
-        a.ad.q(this.br, this.t);
+        a.ad.p(this.br, this.t);
     };
     DrawingNamespaceDefinitionBase.prototype.co = function (a) {
     };
     DrawingNamespaceDefinitionBase.prototype.dg = function (a) {
-        a.ad.q(this.bs, this.t);
+        a.ad.p(this.bs, this.t);
     };
     DrawingNamespaceDefinitionBase.prototype.cp = function (a, b, c) {
         var e_46, _0;
@@ -8478,13 +8390,13 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (c === void 0) {
             c = false;
         }
-        a.ad.q(this.bt, this.t);
+        a.ad.p(this.bt, this.t);
         var d;
         d = b;
         DrawingNamespaceDefinitionBase.db(a, d);
         if (c != false) {
             d = ST_OnOff.g(c);
-            a.ad.i("fPublished", d);
+            a.ad.h("fPublished", d);
         }
     };
     DrawingNamespaceDefinitionBase.prototype.cq = function (a, b, c, d, e) {
@@ -8546,19 +8458,19 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (e === void 0) {
             e = false;
         }
-        a.ad.q(this.bx, this.t);
+        a.ad.p(this.bx, this.t);
         var f;
         f = b;
         DrawingNamespaceDefinitionBase.db(a, f);
         f = c;
-        a.ad.i("textlink", f);
+        a.ad.h("textlink", f);
         if (d != true) {
             f = ST_OnOff.g(d);
-            a.ad.i("fLocksText", f);
+            a.ad.h("fLocksText", f);
         }
         if (e != false) {
             f = ST_OnOff.g(e);
-            a.ad.i("fPublished", f);
+            a.ad.h("fPublished", f);
         }
     };
     DrawingNamespaceDefinitionBase.prototype.cr = function (a, b) {
@@ -8577,11 +8489,11 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (b === void 0) {
             b = toNullable(ST_BlackWhiteMode_$type, null);
         }
-        a.ad.q(this.by, this.t);
+        a.ad.p(this.by, this.t);
         var c;
         if (nullableNotEquals(b, null)) {
             c = XmlNamespaceDefinitionBase.p(ST_BlackWhiteMode_$type, b.value);
-            a.ad.i("bwMode", c);
+            a.ad.h("bwMode", c);
         }
     };
     DrawingNamespaceDefinitionBase.prototype.cs = function (a, b, c) {
@@ -8605,12 +8517,12 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
     DrawingNamespaceDefinitionBase.prototype.ct = function (a) {
     };
     DrawingNamespaceDefinitionBase.prototype.dl = function (a) {
-        a.ad.q(this.b0, this.t);
+        a.ad.p(this.b0, this.t);
     };
     DrawingNamespaceDefinitionBase.prototype.cu = function (a) {
     };
     DrawingNamespaceDefinitionBase.prototype.dm = function (a) {
-        a.ad.q(this.b2, this.t);
+        a.ad.p(this.b2, this.t);
     };
     DrawingNamespaceDefinitionBase.prototype.cv = function (a, b, c, d) {
         var e_48, _0;
@@ -8663,19 +8575,19 @@ export var DrawingNamespaceDefinitionBase = /** @class */ /*@__PURE__*/ (functio
         if (d === void 0) {
             d = false;
         }
-        a.ad.q(this.b4, this.t);
+        a.ad.p(this.b4, this.t);
         var e;
         if (b.n() != 0) {
             e = b.toString();
-            a.ad.i("rot", e);
+            a.ad.h("rot", e);
         }
         if (c != false) {
             e = ST_OnOff.g(c);
-            a.ad.i("flipH", e);
+            a.ad.h("flipH", e);
         }
         if (d != false) {
             e = ST_OnOff.g(d);
-            a.ad.i("flipV", e);
+            a.ad.h("flipV", e);
         }
     };
     DrawingNamespaceDefinitionBase.$t = markType(DrawingNamespaceDefinitionBase, 'DrawingNamespaceDefinitionBase', XmlNamespaceDefinitionBase.$);
@@ -8711,10 +8623,10 @@ export var EmptyNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         if (c === void 0) {
             c = toNullable(Number_$type, null);
         }
-        a.ad.p("xml");
+        a.ad.o("xml");
         var d = a.d._ab;
-        a.ad.m(VmlNamespace.ao);
-        a.ad.m(OfficeNamespace.ao);
+        a.ad.l(VmlNamespace.ao);
+        a.ad.l(OfficeNamespace.ao);
     };
     EmptyNamespace.$t = markType(EmptyNamespace, 'EmptyNamespace', XmlNamespaceDefinitionBase.$);
     EmptyNamespace.ao = new EmptyNamespace();
@@ -8774,7 +8686,7 @@ export var MarkupCompatibility2006 = /** @class */ /*@__PURE__*/ (function (_sup
     MarkupCompatibility2006.aw = function (a) {
     };
     MarkupCompatibility2006.az = function (a) {
-        a.ad.q(MarkupCompatibility2006.aq, "mc");
+        a.ad.p(MarkupCompatibility2006.aq, "mc");
     };
     MarkupCompatibility2006.ax = function (a, b) {
         b = a.ao("Requires");
@@ -8786,15 +8698,15 @@ export var MarkupCompatibility2006 = /** @class */ /*@__PURE__*/ (function (_sup
         MarkupCompatibility2006.a1(a, stringJoin1(String_$type, " ", Enumerable.o(XmlNamespaceDefinitionBase.$, String_$type, b, function (c) { return c.t; })));
     };
     MarkupCompatibility2006.a1 = function (a, b) {
-        a.ad.q(MarkupCompatibility2006.ar, "mc");
+        a.ad.p(MarkupCompatibility2006.ar, "mc");
         var c;
         c = b;
-        a.ad.i("Requires", c);
+        a.ad.h("Requires", c);
     };
     MarkupCompatibility2006.ay = function (a) {
     };
     MarkupCompatibility2006.a2 = function (a) {
-        a.ad.q(MarkupCompatibility2006.as, "mc");
+        a.ad.p(MarkupCompatibility2006.as, "mc");
     };
     MarkupCompatibility2006.$t = markType(MarkupCompatibility2006, 'MarkupCompatibility2006', XmlNamespaceDefinitionBase.$);
     MarkupCompatibility2006.au = "http://schemas.openxmlformats.org/markup-compatibility/2006";
@@ -8977,7 +8889,7 @@ export var OfficeDocumentDocPropsVTypes = /** @class */ /*@__PURE__*/ (function
     OfficeDocumentDocPropsVTypes.ca = function (a) {
     };
     OfficeDocumentDocPropsVTypes.cw = function (a) {
-        a.ad.q(OfficeDocumentDocPropsVTypes.ba, "vt");
+        a.ad.p(OfficeDocumentDocPropsVTypes.ba, "vt");
     };
     OfficeDocumentDocPropsVTypes.cb = function (a, b, c) {
         var e_49, _0;
@@ -9016,12 +8928,12 @@ export var OfficeDocumentDocPropsVTypes = /** @class */ /*@__PURE__*/ (function
         };
     };
     OfficeDocumentDocPropsVTypes.cx = function (a, b, c) {
-        a.ad.q(OfficeDocumentDocPropsVTypes.bb, "vt");
+        a.ad.p(OfficeDocumentDocPropsVTypes.bb, "vt");
         var d;
         d = XmlNamespaceDefinitionBase.p(ST_VectorBaseType_$type, b);
-        a.ad.i("baseType", d);
+        a.ad.h("baseType", d);
         d = c.toString();
-        a.ad.i("size", d);
+        a.ad.h("size", d);
     };
     OfficeDocumentDocPropsVTypes.bc = function (a) {
         var b = a.s.a(IVariantValueContainer_$type);
@@ -9261,12 +9173,12 @@ export var OfficeDocumentDocPropsVTypes = /** @class */ /*@__PURE__*/ (function
         else {
             return;
         }
-        a.ad.l();
+        a.ad.k();
     };
     OfficeDocumentDocPropsVTypes.ce = function (a, b) {
         OfficeDocumentDocPropsVTypes.cw(a);
         OfficeDocumentDocPropsVTypes.cd(a, b);
-        a.ad.l();
+        a.ad.k();
     };
     OfficeDocumentDocPropsVTypes.cf = function (a, b) {
         OfficeDocumentDocPropsVTypes.cx(a, b.b, intSToU(b.a.length));
@@ -9276,7 +9188,7 @@ export var OfficeDocumentDocPropsVTypes = /** @class */ /*@__PURE__*/ (function
         else {
             DocCoreUtils.ao(Base.$, b.a, function (c) { return OfficeDocumentDocPropsVTypes.cd(a, c); });
         }
-        a.ad.l();
+        a.ad.k();
     };
     OfficeDocumentDocPropsVTypes.$t = markType(OfficeDocumentDocPropsVTypes, 'OfficeDocumentDocPropsVTypes', XmlNamespaceDefinitionBase.$);
     OfficeDocumentDocPropsVTypes.a2 = "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes";
@@ -9384,7 +9296,7 @@ export var OfficeDocumentExtendedProperties = /** @class */ /*@__PURE__*/ (funct
     OfficeDocumentExtendedProperties.bo = function (a) {
     };
     OfficeDocumentExtendedProperties.cf = function (a) {
-        a.ad.q(OfficeDocumentExtendedProperties.aw, null);
+        a.ad.p(OfficeDocumentExtendedProperties.aw, null);
     };
     OfficeDocumentExtendedProperties.bp = function (a, b) {
         b = XmlNamespaceDefinitionBase.l(a, OfficeDocumentExtendedProperties.ax);
@@ -9488,10 +9400,10 @@ export var OfficeDocumentExtendedProperties = /** @class */ /*@__PURE__*/ (funct
     OfficeDocumentExtendedProperties.b0 = function (a) {
     };
     OfficeDocumentExtendedProperties.cr = function (a) {
-        a.ad.q(OfficeDocumentExtendedProperties.ba, null);
+        a.ad.p(OfficeDocumentExtendedProperties.ba, null);
         var b = a.d._ab;
-        a.ad.m(OfficeDocumentExtendedProperties.ao);
-        a.ad.m(OfficeDocumentDocPropsVTypes.ao);
+        a.ad.l(OfficeDocumentExtendedProperties.ao);
+        a.ad.l(OfficeDocumentDocPropsVTypes.ao);
     };
     OfficeDocumentExtendedProperties.b1 = function (a, b) {
         b = XmlNamespaceDefinitionBase.e(a, OfficeDocumentExtendedProperties.bb);
@@ -9532,7 +9444,7 @@ export var OfficeDocumentExtendedProperties = /** @class */ /*@__PURE__*/ (funct
     OfficeDocumentExtendedProperties.b5 = function (a) {
     };
     OfficeDocumentExtendedProperties.cv = function (a) {
-        a.ad.q(OfficeDocumentExtendedProperties.bf, null);
+        a.ad.p(OfficeDocumentExtendedProperties.bf, null);
     };
     OfficeDocumentExtendedProperties.b6 = function (a, b) {
         b = XmlNamespaceDefinitionBase.l(a, OfficeDocumentExtendedProperties.bg);
@@ -9688,14 +9600,14 @@ export var OfficeNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         if (c === void 0) {
             c = null;
         }
-        a.ad.q(OfficeNamespace.bs, "o");
+        a.ad.p(OfficeNamespace.bs, "o");
         var d;
         if (nullableNotEquals(b, null)) {
             d = XmlNamespaceDefinitionBase.p(ST_Ext_$type, b.value);
-            a.ad.i("urn:schemas-microsoft-com:vml/ext", d);
+            a.ad.h("urn:schemas-microsoft-com:vml/ext", d);
         }
         d = c;
-        a.ad.i("data", d);
+        a.ad.h("data", d);
     };
     OfficeNamespace.cj = function (a, b, c, d, e, f, g, h, i, j, k, l, m) {
         var e_51, _0;
@@ -9820,55 +9732,55 @@ export var OfficeNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         if (m === void 0) {
             m = toNullable(Boolean_$type, null);
         }
-        a.ad.q(OfficeNamespace.ap, "o");
+        a.ad.p(OfficeNamespace.ap, "o");
         var n;
         if (nullableNotEquals(b, null)) {
             n = XmlNamespaceDefinitionBase.p(ST_Ext_$type, b.value);
-            a.ad.i("urn:schemas-microsoft-com:vml/ext", n);
+            a.ad.h("urn:schemas-microsoft-com:vml/ext", n);
         }
         if (nullableNotEquals(c, null)) {
             n = ST_TrueFalse.k(ST_TrueFalse.b(c.value));
-            a.ad.i("position", n);
+            a.ad.h("position", n);
         }
         if (nullableNotEquals(d, null)) {
             n = ST_TrueFalse.k(ST_TrueFalse.b(d.value));
-            a.ad.i("selection", n);
+            a.ad.h("selection", n);
         }
         if (nullableNotEquals(e, null)) {
             n = ST_TrueFalse.k(ST_TrueFalse.b(e.value));
-            a.ad.i("grouping", n);
+            a.ad.h("grouping", n);
         }
         if (nullableNotEquals(f, null)) {
             n = ST_TrueFalse.k(ST_TrueFalse.b(f.value));
-            a.ad.i("ungrouping", n);
+            a.ad.h("ungrouping", n);
         }
         if (nullableNotEquals(g, null)) {
             n = ST_TrueFalse.k(ST_TrueFalse.b(g.value));
-            a.ad.i("rotation", n);
+            a.ad.h("rotation", n);
         }
         if (nullableNotEquals(h, null)) {
             n = ST_TrueFalse.k(ST_TrueFalse.b(h.value));
-            a.ad.i("cropping", n);
+            a.ad.h("cropping", n);
         }
         if (nullableNotEquals(i, null)) {
             n = ST_TrueFalse.k(ST_TrueFalse.b(i.value));
-            a.ad.i("verticies", n);
+            a.ad.h("verticies", n);
         }
         if (nullableNotEquals(j, null)) {
             n = ST_TrueFalse.k(ST_TrueFalse.b(j.value));
-            a.ad.i("adjusthandles", n);
+            a.ad.h("adjusthandles", n);
         }
         if (nullableNotEquals(k, null)) {
             n = ST_TrueFalse.k(ST_TrueFalse.b(k.value));
-            a.ad.i("text", n);
+            a.ad.h("text", n);
         }
         if (nullableNotEquals(l, null)) {
             n = ST_TrueFalse.k(ST_TrueFalse.b(l.value));
-            a.ad.i("aspectratio", n);
+            a.ad.h("aspectratio", n);
         }
         if (nullableNotEquals(m, null)) {
             n = ST_TrueFalse.k(ST_TrueFalse.b(m.value));
-            a.ad.i("shapetype", n);
+            a.ad.h("shapetype", n);
         }
     };
     OfficeNamespace.ck = function (a, b) {
@@ -9887,11 +9799,11 @@ export var OfficeNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         if (b === void 0) {
             b = toNullable(ST_Ext_$type, null);
         }
-        a.ad.q(OfficeNamespace.b7, "o");
+        a.ad.p(OfficeNamespace.b7, "o");
         var c;
         if (nullableNotEquals(b, null)) {
             c = XmlNamespaceDefinitionBase.p(ST_Ext_$type, b.value);
-            a.ad.i("urn:schemas-microsoft-com:vml/ext", c);
+            a.ad.h("urn:schemas-microsoft-com:vml/ext", c);
         }
     };
     OfficeNamespace.$t = markType(OfficeNamespace, 'OfficeNamespace', XmlNamespaceDefinitionBase.$);
@@ -9974,7 +9886,7 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    VmlNamespace.ds = function (a, b, c) {
+    VmlNamespace.dp = function (a, b, c) {
         var e_52, _0;
         b = toNullable(Number_$type, null);
         c = toNullable(Number_$type, null);
@@ -10010,67 +9922,27 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
             p2: c
         };
     };
-    VmlNamespace.d3 = function (a, b, c) {
+    VmlNamespace.dy = function (a, b, c) {
         if (b === void 0) {
             b = toNullable(Number_$type, null);
         }
         if (c === void 0) {
             c = toNullable(Number_$type, null);
         }
-        a.ad.q("urn:schemas-microsoft-com:vml/arc", "v");
+        a.ad.p("urn:schemas-microsoft-com:vml/arc", "v");
         var d;
         if (nullableNotEquals(b, null)) {
             d = numberToString(b.value, CultureInfo.invariantCulture);
-            a.ad.i("startAngle", d);
+            a.ad.h("startAngle", d);
         }
         if (nullableNotEquals(c, null)) {
             d = numberToString(c.value, CultureInfo.invariantCulture);
-            a.ad.i("endAngle", d);
+            a.ad.h("endAngle", d);
         }
     };
-    VmlNamespace.dt = function (a, b) {
+    VmlNamespace.dq = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab) {
         var e_53, _0;
         b = null;
-        try {
-            for (var _1 = __values(fromEnum(a.ab.u)), _2 = _1.next(); !_2.done; _2 = _1.next()) {
-                var c = _2.value;
-                switch (c.a.e(a.d)) {
-                    case "eqn":
-                        b = c.d;
-                        break;
-                    default: break;
-                }
-            }
-        }
-        catch (e_53_1) {
-            e_53 = { error: e_53_1 };
-        }
-        finally {
-            try {
-                if (_2 && !_2.done && (_0 = _1.return))
-                    _0.call(_1);
-            }
-            finally {
-                if (e_53)
-                    throw e_53.error;
-            }
-        }
-        return {
-            p1: b
-        };
-    };
-    VmlNamespace.d4 = function (a, b) {
-        a.ad.q("urn:schemas-microsoft-com:vml/f", "v");
-        a.ad.i("eqn", b);
-    };
-    VmlNamespace.dv = function (a) {
-    };
-    VmlNamespace.d6 = function (a) {
-        a.ad.q("urn:schemas-microsoft-com:vml/formulas", "v");
-    };
-    VmlNamespace.du = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab) {
-        var e_54, _0;
-        b = null;
         c = toNullable(ST_FillType_$type, null);
         d = toNullable(Boolean_$type, null);
         e = null;
@@ -10186,8 +10058,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        catch (e_54_1) {
-            e_54 = { error: e_54_1 };
+        catch (e_53_1) {
+            e_53 = { error: e_53_1 };
         }
         finally {
             try {
@@ -10195,8 +10067,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                     _0.call(_1);
             }
             finally {
-                if (e_54)
-                    throw e_54.error;
+                if (e_53)
+                    throw e_53.error;
             }
         }
         return {
@@ -10229,7 +10101,7 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
             p27: ab
         };
     };
-    VmlNamespace.d5 = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab) {
+    VmlNamespace.dz = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab) {
         if (b === void 0) {
             b = null;
         }
@@ -10311,83 +10183,83 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         if (ab === void 0) {
             ab = null;
         }
-        a.ad.q("urn:schemas-microsoft-com:vml/fill", "v");
+        a.ad.p("urn:schemas-microsoft-com:vml/fill", "v");
         var ac;
         ac = b;
-        a.ad.i("id", ac);
+        a.ad.h("id", ac);
         if (nullableNotEquals(c, null)) {
             ac = XmlNamespaceDefinitionBase.p(ST_FillType_$type, c.value);
-            a.ad.i("type", ac);
+            a.ad.h("type", ac);
         }
         if (nullableNotEquals(d, null)) {
             ac = ST_TrueFalse.k(ST_TrueFalse.b(d.value));
-            a.ad.i("on", ac);
+            a.ad.h("on", ac);
         }
         ac = e;
-        a.ad.i("color", ac);
+        a.ad.h("color", ac);
         ac = f;
-        a.ad.i("opacity", ac);
+        a.ad.h("opacity", ac);
         ac = g;
-        a.ad.i("color2", ac);
+        a.ad.h("color2", ac);
         ac = h;
-        a.ad.i("src", ac);
+        a.ad.h("src", ac);
         ac = i;
-        a.ad.i(OfficeNamespace.bo, ac);
+        a.ad.h(OfficeNamespace.bo, ac);
         ac = j;
-        a.ad.i(OfficeNamespace.au, ac);
+        a.ad.h(OfficeNamespace.au, ac);
         ac = k;
-        a.ad.i("size", ac);
+        a.ad.h("size", ac);
         ac = l;
-        a.ad.i("origin", ac);
+        a.ad.h("origin", ac);
         ac = m;
-        a.ad.i("position", ac);
+        a.ad.h("position", ac);
         if (nullableNotEquals(n, null)) {
             ac = XmlNamespaceDefinitionBase.p(ST_ImageAspect_$type, n.value);
-            a.ad.i("aspect", ac);
+            a.ad.h("aspect", ac);
         }
         ac = o;
-        a.ad.i("colors", ac);
+        a.ad.h("colors", ac);
         if (nullableNotEquals(p, null)) {
             ac = numberToString(p.value, CultureInfo.invariantCulture);
-            a.ad.i("angle", ac);
+            a.ad.h("angle", ac);
         }
         if (nullableNotEquals(q, null)) {
             ac = ST_TrueFalse.k(ST_TrueFalse.b(q.value));
-            a.ad.i("alignshape", ac);
+            a.ad.h("alignshape", ac);
         }
         ac = r;
-        a.ad.i("focus", ac);
+        a.ad.h("focus", ac);
         ac = s;
-        a.ad.i("focussize", ac);
+        a.ad.h("focussize", ac);
         ac = t;
-        a.ad.i("focusposition", ac);
+        a.ad.h("focusposition", ac);
         if (nullableNotEquals(u, null)) {
             ac = XmlNamespaceDefinitionBase.p(ST_FillMethod_$type, u.value);
-            a.ad.i("method", ac);
+            a.ad.h("method", ac);
         }
         if (nullableNotEquals(v, null)) {
             ac = ST_TrueFalse.k(ST_TrueFalse.b(v.value));
-            a.ad.i(OfficeNamespace.bd, ac);
+            a.ad.h(OfficeNamespace.bd, ac);
         }
         ac = w;
-        a.ad.i(OfficeNamespace.cd, ac);
+        a.ad.h(OfficeNamespace.cd, ac);
         ac = x;
-        a.ad.i(OfficeNamespace.b0, ac);
+        a.ad.h(OfficeNamespace.b0, ac);
         if (nullableNotEquals(y, null)) {
             ac = ST_TrueFalse.k(ST_TrueFalse.b(y.value));
-            a.ad.i("recolor", ac);
+            a.ad.h("recolor", ac);
         }
         if (nullableNotEquals(z, null)) {
             ac = ST_TrueFalse.k(ST_TrueFalse.b(z.value));
-            a.ad.i("rotate", ac);
+            a.ad.h("rotate", ac);
         }
         ac = aa;
-        a.ad.i(OfficeDocumentRelationships.as, ac);
+        a.ad.h(OfficeDocumentRelationships.as, ac);
         ac = ab;
-        a.ad.i(OfficeNamespace.b4, ac);
+        a.ad.h(OfficeNamespace.b4, ac);
     };
-    VmlNamespace.dw = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) {
-        var e_55, _0;
+    VmlNamespace.dr = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) {
+        var e_54, _0;
         b = null;
         c = null;
         d = null;
@@ -10492,8 +10364,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        catch (e_55_1) {
-            e_55 = { error: e_55_1 };
+        catch (e_54_1) {
+            e_54 = { error: e_54_1 };
         }
         finally {
             try {
@@ -10501,8 +10373,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                     _0.call(_1);
             }
             finally {
-                if (e_55)
-                    throw e_55.error;
+                if (e_54)
+                    throw e_54.error;
             }
         }
         return {
@@ -10532,7 +10404,7 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
             p24: y
         };
     };
-    VmlNamespace.d7 = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) {
+    VmlNamespace.d0 = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) {
         if (b === void 0) {
             b = null;
         }
@@ -10605,69 +10477,69 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         if (y === void 0) {
             y = null;
         }
-        a.ad.q("urn:schemas-microsoft-com:vml/imagedata", "v");
+        a.ad.p("urn:schemas-microsoft-com:vml/imagedata", "v");
         var z;
         z = b;
-        a.ad.i("id", z);
+        a.ad.h("id", z);
         z = c;
-        a.ad.i("src", z);
+        a.ad.h("src", z);
         z = d;
-        a.ad.i("cropleft", z);
+        a.ad.h("cropleft", z);
         z = e;
-        a.ad.i("croptop", z);
+        a.ad.h("croptop", z);
         z = f;
-        a.ad.i("cropright", z);
+        a.ad.h("cropright", z);
         z = g;
-        a.ad.i("cropbottom", z);
+        a.ad.h("cropbottom", z);
         z = h;
-        a.ad.i("gain", z);
+        a.ad.h("gain", z);
         z = i;
-        a.ad.i("blacklevel", z);
+        a.ad.h("blacklevel", z);
         z = j;
-        a.ad.i("gamma", z);
+        a.ad.h("gamma", z);
         if (nullableNotEquals(k, null)) {
             z = ST_TrueFalse.k(ST_TrueFalse.b(k.value));
-            a.ad.i("grayscale", z);
+            a.ad.h("grayscale", z);
         }
         if (nullableNotEquals(l, null)) {
             z = ST_TrueFalse.k(ST_TrueFalse.b(l.value));
-            a.ad.i("bilevel", z);
+            a.ad.h("bilevel", z);
         }
         z = m;
-        a.ad.i("chromakey", z);
+        a.ad.h("chromakey", z);
         z = n;
-        a.ad.i("embosscolor", z);
+        a.ad.h("embosscolor", z);
         z = o;
-        a.ad.i("recolortarget", z);
+        a.ad.h("recolortarget", z);
         z = p;
-        a.ad.i(OfficeNamespace.bo, z);
+        a.ad.h(OfficeNamespace.bo, z);
         z = q;
-        a.ad.i(OfficeNamespace.au, z);
+        a.ad.h(OfficeNamespace.au, z);
         z = r;
-        a.ad.i(OfficeNamespace.cd, z);
+        a.ad.h(OfficeNamespace.cd, z);
         if (nullableNotEquals(s, null)) {
             z = numberToString(s.value, CultureInfo.invariantCulture);
-            a.ad.i(OfficeNamespace.by, z);
+            a.ad.h(OfficeNamespace.by, z);
         }
         if (nullableNotEquals(t, null)) {
             z = ST_TrueFalse.k(ST_TrueFalse.b(t.value));
-            a.ad.i(OfficeNamespace.bd, z);
+            a.ad.h(OfficeNamespace.bd, z);
         }
         if (nullableNotEquals(u, null)) {
             z = numberToString(u.value, CultureInfo.invariantCulture);
-            a.ad.i(OfficeNamespace.bu, z);
+            a.ad.h(OfficeNamespace.bu, z);
         }
         z = v;
-        a.ad.i(OfficeNamespace.b4, z);
+        a.ad.h(OfficeNamespace.b4, z);
         z = w;
-        a.ad.i(OfficeDocumentRelationships.as, z);
+        a.ad.h(OfficeDocumentRelationships.as, z);
         z = x;
-        a.ad.i(OfficeDocumentRelationships.aw, z);
+        a.ad.h(OfficeDocumentRelationships.aw, z);
         z = y;
-        a.ad.i(OfficeDocumentRelationships.ar, z);
+        a.ad.h(OfficeDocumentRelationships.ar, z);
     };
-    VmlNamespace.dx = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) {
-        var e_56, _0;
+    VmlNamespace.ds = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) {
+        var e_55, _0;
         b = null;
         c = null;
         d = null;
@@ -10736,8 +10608,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        catch (e_56_1) {
-            e_56 = { error: e_56_1 };
+        catch (e_55_1) {
+            e_55 = { error: e_55_1 };
         }
         finally {
             try {
@@ -10745,8 +10617,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                     _0.call(_1);
             }
             finally {
-                if (e_56)
-                    throw e_56.error;
+                if (e_55)
+                    throw e_55.error;
             }
         }
         return {
@@ -10767,7 +10639,7 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
             p15: p
         };
     };
-    VmlNamespace.d8 = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) {
+    VmlNamespace.d1 = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) {
         if (b === void 0) {
             b = null;
         }
@@ -10813,59 +10685,59 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         if (p === void 0) {
             p = toNullable(Boolean_$type, null);
         }
-        a.ad.q("urn:schemas-microsoft-com:vml/path", "v");
+        a.ad.p("urn:schemas-microsoft-com:vml/path", "v");
         var q;
         q = b;
-        a.ad.i("id", q);
+        a.ad.h("id", q);
         q = c;
-        a.ad.i("v", q);
+        a.ad.h("v", q);
         q = d;
-        a.ad.i("limo", q);
+        a.ad.h("limo", q);
         q = e;
-        a.ad.i("textboxrect", q);
+        a.ad.h("textboxrect", q);
         if (nullableNotEquals(f, null)) {
             q = ST_TrueFalse.k(ST_TrueFalse.b(f.value));
-            a.ad.i("fillok", q);
+            a.ad.h("fillok", q);
         }
         if (nullableNotEquals(g, null)) {
             q = ST_TrueFalse.k(ST_TrueFalse.b(g.value));
-            a.ad.i("strokeok", q);
+            a.ad.h("strokeok", q);
         }
         if (nullableNotEquals(h, null)) {
             q = ST_TrueFalse.k(ST_TrueFalse.b(h.value));
-            a.ad.i("shadowok", q);
+            a.ad.h("shadowok", q);
         }
         if (nullableNotEquals(i, null)) {
             q = ST_TrueFalse.k(ST_TrueFalse.b(i.value));
-            a.ad.i("arrowok", q);
+            a.ad.h("arrowok", q);
         }
         if (nullableNotEquals(j, null)) {
             q = ST_TrueFalse.k(ST_TrueFalse.b(j.value));
-            a.ad.i("gradientshapeok", q);
+            a.ad.h("gradientshapeok", q);
         }
         if (nullableNotEquals(k, null)) {
             q = ST_TrueFalse.k(ST_TrueFalse.b(k.value));
-            a.ad.i("textpathok", q);
+            a.ad.h("textpathok", q);
         }
         if (nullableNotEquals(l, null)) {
             q = ST_TrueFalse.k(ST_TrueFalse.b(l.value));
-            a.ad.i("insetpenok", q);
+            a.ad.h("insetpenok", q);
         }
         if (nullableNotEquals(m, null)) {
             q = XmlNamespaceDefinitionBase.p(ST_ConnectType_$type, m.value);
-            a.ad.i(OfficeNamespace.ba, q);
+            a.ad.h(OfficeNamespace.ba, q);
         }
         q = n;
-        a.ad.i(OfficeNamespace.a8, q);
+        a.ad.h(OfficeNamespace.a8, q);
         q = o;
-        a.ad.i(OfficeNamespace.a7, q);
+        a.ad.h(OfficeNamespace.a7, q);
         if (nullableNotEquals(p, null)) {
             q = ST_TrueFalse.k(ST_TrueFalse.b(p.value));
-            a.ad.i(OfficeNamespace.bi, q);
+            a.ad.h(OfficeNamespace.bi, q);
         }
     };
-    VmlNamespace.dy = function (a, b, c, d, e, f, g, h, i, j, k, l) {
-        var e_57, _0;
+    VmlNamespace.dt = function (a, b, c, d, e, f, g, h, i, j, k, l) {
+        var e_56, _0;
         b = null;
         c = toNullable(Boolean_$type, null);
         d = toNullable(ST_ShadowType_$type, null);
@@ -10918,8 +10790,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        catch (e_57_1) {
-            e_57 = { error: e_57_1 };
+        catch (e_56_1) {
+            e_56 = { error: e_56_1 };
         }
         finally {
             try {
@@ -10927,8 +10799,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                     _0.call(_1);
             }
             finally {
-                if (e_57)
-                    throw e_57.error;
+                if (e_56)
+                    throw e_56.error;
             }
         }
         return {
@@ -10945,7 +10817,7 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
             p11: l
         };
     };
-    VmlNamespace.d9 = function (a, b, c, d, e, f, g, h, i, j, k, l) {
+    VmlNamespace.d2 = function (a, b, c, d, e, f, g, h, i, j, k, l) {
         if (b === void 0) {
             b = null;
         }
@@ -10979,39 +10851,39 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         if (l === void 0) {
             l = null;
         }
-        a.ad.q("urn:schemas-microsoft-com:vml/shadow", "v");
+        a.ad.p("urn:schemas-microsoft-com:vml/shadow", "v");
         var m;
         m = b;
-        a.ad.i("id", m);
+        a.ad.h("id", m);
         if (nullableNotEquals(c, null)) {
             m = ST_TrueFalse.k(ST_TrueFalse.b(c.value));
-            a.ad.i("on", m);
+            a.ad.h("on", m);
         }
         if (nullableNotEquals(d, null)) {
             m = XmlNamespaceDefinitionBase.p(ST_ShadowType_$type, d.value);
-            a.ad.i("type", m);
+            a.ad.h("type", m);
         }
         if (nullableNotEquals(e, null)) {
             m = ST_TrueFalse.k(ST_TrueFalse.b(e.value));
-            a.ad.i("obscured", m);
+            a.ad.h("obscured", m);
         }
         m = f;
-        a.ad.i("color", m);
+        a.ad.h("color", m);
         m = g;
-        a.ad.i("opacity", m);
+        a.ad.h("opacity", m);
         m = h;
-        a.ad.i("offset", m);
+        a.ad.h("offset", m);
         m = i;
-        a.ad.i("color2", m);
+        a.ad.h("color2", m);
         m = j;
-        a.ad.i("offset2", m);
+        a.ad.h("offset2", m);
         m = k;
-        a.ad.i("origin", m);
+        a.ad.h("origin", m);
         m = l;
-        a.ad.i("matrix", m);
+        a.ad.h("matrix", m);
     };
-    VmlNamespace.dz = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, as, at, au, av, aw, ax, ay, az, a0, a1, a2, a3, a4, a5, a6) {
-        var e_58, _0;
+    VmlNamespace.du = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, as, at, au, av, aw, ax, ay, az, a0, a1, a2, a3, a4, a5, a6) {
+        var e_57, _0;
         b = null;
         c = null;
         d = null;
@@ -11252,8 +11124,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        catch (e_58_1) {
-            e_58 = { error: e_58_1 };
+        catch (e_57_1) {
+            e_57 = { error: e_57_1 };
         }
         finally {
             try {
@@ -11261,8 +11133,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                     _0.call(_1);
             }
             finally {
-                if (e_58)
-                    throw e_58.error;
+                if (e_57)
+                    throw e_57.error;
             }
         }
         return {
@@ -11326,7 +11198,7 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
             p58: a6
         };
     };
-    VmlNamespace.ea = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, as, at, au, av, aw, ax, ay, az, a0, a1, a2, a3, a4, a5, a6) {
+    VmlNamespace.d3 = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, as, at, au, av, aw, ax, ay, az, a0, a1, a2, a3, a4, a5, a6) {
         if (b === void 0) {
             b = null;
         }
@@ -11501,185 +11373,185 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         if (a6 === void 0) {
             a6 = null;
         }
-        a.ad.q("urn:schemas-microsoft-com:vml/shape", "v");
+        a.ad.p("urn:schemas-microsoft-com:vml/shape", "v");
         var a7;
         a7 = b;
-        a.ad.i("id", a7);
+        a.ad.h("id", a7);
         a7 = c;
-        a.ad.i("style", a7);
+        a.ad.h("style", a7);
         a7 = d;
-        a.ad.i("href", a7);
+        a.ad.h("href", a7);
         a7 = e;
-        a.ad.i("target", a7);
+        a.ad.h("target", a7);
         a7 = f;
-        a.ad.i("class", a7);
+        a.ad.h("class", a7);
         a7 = g;
-        a.ad.i("title", a7);
+        a.ad.h("title", a7);
         a7 = h;
-        a.ad.i("alt", a7);
+        a.ad.h("alt", a7);
         a7 = i;
-        a.ad.i("coordsize", a7);
+        a.ad.h("coordsize", a7);
         a7 = j;
-        a.ad.i("coordorigin", a7);
+        a.ad.h("coordorigin", a7);
         a7 = k;
-        a.ad.i("wrapcoords", a7);
+        a.ad.h("wrapcoords", a7);
         if (nullableNotEquals(l, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(l.value));
-            a.ad.i("print", a7);
+            a.ad.h("print", a7);
         }
         a7 = m;
-        a.ad.i(OfficeNamespace.ca, a7);
+        a.ad.h(OfficeNamespace.ca, a7);
         if (nullableNotEquals(n, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(n.value));
-            a.ad.i(OfficeNamespace.bz, a7);
+            a.ad.h(OfficeNamespace.bz, a7);
         }
         a7 = o;
-        a.ad.i(OfficeNamespace.b3, a7);
+        a.ad.h(OfficeNamespace.b3, a7);
         if (nullableNotEquals(p, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(p.value));
-            a.ad.i(OfficeNamespace.bh, a7);
+            a.ad.h(OfficeNamespace.bh, a7);
         }
         if (nullableNotEquals(q, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(q.value));
-            a.ad.i(OfficeNamespace.a1, a7);
+            a.ad.h(OfficeNamespace.a1, a7);
         }
         if (nullableNotEquals(r, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(r.value));
-            a.ad.i(OfficeNamespace.cg, a7);
+            a.ad.h(OfficeNamespace.cg, a7);
         }
         if (nullableNotEquals(s, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(s.value));
-            a.ad.i(OfficeNamespace.a0, a7);
+            a.ad.h(OfficeNamespace.a0, a7);
         }
         if (nullableNotEquals(t, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(t.value));
-            a.ad.i(OfficeNamespace.bm, a7);
+            a.ad.h(OfficeNamespace.bm, a7);
         }
         if (nullableNotEquals(u, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(u.value));
-            a.ad.i(OfficeNamespace.br, a7);
+            a.ad.h(OfficeNamespace.br, a7);
         }
         if (nullableNotEquals(v, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(v.value));
-            a.ad.i(OfficeNamespace.bp, a7);
+            a.ad.h(OfficeNamespace.bp, a7);
         }
         if (nullableNotEquals(w, null)) {
             a7 = numberToString(w.value, CultureInfo.invariantCulture);
-            a.ad.i(OfficeNamespace.bq, a7);
+            a.ad.h(OfficeNamespace.bq, a7);
         }
         if (nullableNotEquals(x, null)) {
             a7 = XmlNamespaceDefinitionBase.p(ST_HrAlign_$type, x.value);
-            a.ad.i(OfficeNamespace.bn, a7);
+            a.ad.h(OfficeNamespace.bn, a7);
         }
         if (nullableNotEquals(y, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(y.value));
-            a.ad.i(OfficeNamespace.as, a7);
+            a.ad.h(OfficeNamespace.as, a7);
         }
         if (nullableNotEquals(z, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(z.value));
-            a.ad.i(OfficeNamespace.at, a7);
+            a.ad.h(OfficeNamespace.at, a7);
         }
         if (nullableNotEquals(aa, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(aa.value));
-            a.ad.i(OfficeNamespace.cf, a7);
+            a.ad.h(OfficeNamespace.cf, a7);
         }
         a7 = ab;
-        a.ad.i("bordertopcolor", a7);
+        a.ad.h("bordertopcolor", a7);
         a7 = ac;
-        a.ad.i("borderleftcolor", a7);
+        a.ad.h("borderleftcolor", a7);
         a7 = ad;
-        a.ad.i("borderbottomcolor", a7);
+        a.ad.h("borderbottomcolor", a7);
         a7 = ae;
-        a.ad.i("borderrightcolor", a7);
+        a.ad.h("borderrightcolor", a7);
         a7 = af;
-        a.ad.i(OfficeNamespace.be, a7);
+        a.ad.h(OfficeNamespace.be, a7);
         a7 = ag;
-        a.ad.i(OfficeNamespace.bg, a7);
+        a.ad.h(OfficeNamespace.bg, a7);
         a7 = ah;
-        a.ad.i(OfficeNamespace.bf, a7);
+        a.ad.h(OfficeNamespace.bf, a7);
         if (nullableNotEquals(ai, null)) {
             a7 = XmlNamespaceDefinitionBase.p(ST_InsetMode_$type, ai.value);
-            a.ad.i(OfficeNamespace.bt, a7);
+            a.ad.h(OfficeNamespace.bt, a7);
         }
         a7 = aj;
-        a.ad.i("chromakey", a7);
+        a.ad.h("chromakey", a7);
         if (nullableNotEquals(ak, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(ak.value));
-            a.ad.i("filled", a7);
+            a.ad.h("filled", a7);
         }
         a7 = al;
-        a.ad.i("fillcolor", a7);
+        a.ad.h("fillcolor", a7);
         a7 = am;
-        a.ad.i("opacity", a7);
+        a.ad.h("opacity", a7);
         if (nullableNotEquals(an, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(an.value));
-            a.ad.i("stroked", a7);
+            a.ad.h("stroked", a7);
         }
         a7 = ao;
-        a.ad.i("strokecolor", a7);
+        a.ad.h("strokecolor", a7);
         a7 = ap;
-        a.ad.i("strokeweight", a7);
+        a.ad.h("strokeweight", a7);
         if (nullableNotEquals(aq, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(aq.value));
-            a.ad.i("insetpen", a7);
+            a.ad.h("insetpen", a7);
         }
         if (nullableNotEquals(ar, null)) {
             a7 = numberToString(ar.value, CultureInfo.invariantCulture);
-            a.ad.i(OfficeNamespace.cb, a7);
+            a.ad.h(OfficeNamespace.cb, a7);
         }
         if (nullableNotEquals(as, null)) {
             a7 = XmlNamespaceDefinitionBase.p(ST_ConnectorType_$type, as.value);
-            a.ad.i(OfficeNamespace.a9, a7);
+            a.ad.h(OfficeNamespace.a9, a7);
         }
         if (nullableNotEquals(at, null)) {
             a7 = XmlNamespaceDefinitionBase.p(ST_BWMode_$type, at.value);
-            a.ad.i("bwmode", a7);
+            a.ad.h("bwmode", a7);
         }
         if (nullableNotEquals(au, null)) {
             a7 = XmlNamespaceDefinitionBase.p(ST_BWMode_$type, au.value);
-            a.ad.i("bwpure", a7);
+            a.ad.h("bwpure", a7);
         }
         if (nullableNotEquals(av, null)) {
             a7 = XmlNamespaceDefinitionBase.p(ST_BWMode_$type, av.value);
-            a.ad.i("bwnormal", a7);
+            a.ad.h("bwnormal", a7);
         }
         if (nullableNotEquals(aw, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(aw.value));
-            a.ad.i(OfficeNamespace.bj, a7);
+            a.ad.h(OfficeNamespace.bj, a7);
         }
         if (nullableNotEquals(ax, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(ax.value));
-            a.ad.i(OfficeNamespace.bx, a7);
+            a.ad.h(OfficeNamespace.bx, a7);
         }
         if (nullableNotEquals(ay, null)) {
             a7 = ST_TrueFalseBlank.f(ay.value);
-            a.ad.i(OfficeNamespace.bw, a7);
+            a.ad.h(OfficeNamespace.bw, a7);
         }
         if (nullableNotEquals(az, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(az.value));
-            a.ad.i(OfficeNamespace.b2, a7);
+            a.ad.h(OfficeNamespace.b2, a7);
         }
         if (nullableNotEquals(a0, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(a0.value));
-            a.ad.i(OfficeNamespace.a6, a7);
+            a.ad.h(OfficeNamespace.a6, a7);
         }
         if (nullableNotEquals(a1, null)) {
             a7 = ST_TrueFalse.k(ST_TrueFalse.b(a1.value));
-            a.ad.i(OfficeNamespace.a5, a7);
+            a.ad.h(OfficeNamespace.a5, a7);
         }
         a7 = a2;
-        a.ad.i("type", a7);
+        a.ad.h("type", a7);
         a7 = a3;
-        a.ad.i("adj", a7);
+        a.ad.h("adj", a7);
         a7 = a4;
-        a.ad.i("path", a7);
+        a.ad.h("path", a7);
         a7 = a5;
-        a.ad.i("gfxdata", a7);
+        a.ad.h("gfxdata", a7);
         a7 = a6;
-        a.ad.i("equationxml", a7);
+        a.ad.h("equationxml", a7);
     };
-    VmlNamespace.d0 = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, as, at, au, av, aw, ax, ay, az, a0, a1, a2, a3, a4) {
-        var e_59, _0;
+    VmlNamespace.dv = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, as, at, au, av, aw, ax, ay, az, a0, a1, a2, a3, a4) {
+        var e_58, _0;
         b = null;
         c = null;
         d = null;
@@ -11912,8 +11784,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        catch (e_59_1) {
-            e_59 = { error: e_59_1 };
+        catch (e_58_1) {
+            e_58 = { error: e_58_1 };
         }
         finally {
             try {
@@ -11921,8 +11793,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                     _0.call(_1);
             }
             finally {
-                if (e_59)
-                    throw e_59.error;
+                if (e_58)
+                    throw e_58.error;
             }
         }
         return {
@@ -11984,7 +11856,7 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
             p56: a4
         };
     };
-    VmlNamespace.eb = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, as, at, au, av, aw, ax, ay, az, a0, a1, a2, a3, a4) {
+    VmlNamespace.d4 = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, as, at, au, av, aw, ax, ay, az, a0, a1, a2, a3, a4) {
         if (b === void 0) {
             b = null;
         }
@@ -12153,181 +12025,181 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         if (a4 === void 0) {
             a4 = null;
         }
-        a.ad.q("urn:schemas-microsoft-com:vml/shapetype", "v");
+        a.ad.p("urn:schemas-microsoft-com:vml/shapetype", "v");
         var a5;
         a5 = b;
-        a.ad.i("id", a5);
+        a.ad.h("id", a5);
         a5 = c;
-        a.ad.i("style", a5);
+        a.ad.h("style", a5);
         a5 = d;
-        a.ad.i("href", a5);
+        a.ad.h("href", a5);
         a5 = e;
-        a.ad.i("target", a5);
+        a.ad.h("target", a5);
         a5 = f;
-        a.ad.i("class", a5);
+        a.ad.h("class", a5);
         a5 = g;
-        a.ad.i("title", a5);
+        a.ad.h("title", a5);
         a5 = h;
-        a.ad.i("alt", a5);
+        a.ad.h("alt", a5);
         a5 = i;
-        a.ad.i("coordsize", a5);
+        a.ad.h("coordsize", a5);
         a5 = j;
-        a.ad.i("coordorigin", a5);
+        a.ad.h("coordorigin", a5);
         a5 = k;
-        a.ad.i("wrapcoords", a5);
+        a.ad.h("wrapcoords", a5);
         if (nullableNotEquals(l, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(l.value));
-            a.ad.i("print", a5);
+            a.ad.h("print", a5);
         }
         a5 = m;
-        a.ad.i(OfficeNamespace.ca, a5);
+        a.ad.h(OfficeNamespace.ca, a5);
         if (nullableNotEquals(n, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(n.value));
-            a.ad.i(OfficeNamespace.bz, a5);
+            a.ad.h(OfficeNamespace.bz, a5);
         }
         a5 = o;
-        a.ad.i(OfficeNamespace.b3, a5);
+        a.ad.h(OfficeNamespace.b3, a5);
         if (nullableNotEquals(p, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(p.value));
-            a.ad.i(OfficeNamespace.bh, a5);
+            a.ad.h(OfficeNamespace.bh, a5);
         }
         if (nullableNotEquals(q, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(q.value));
-            a.ad.i(OfficeNamespace.a1, a5);
+            a.ad.h(OfficeNamespace.a1, a5);
         }
         if (nullableNotEquals(r, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(r.value));
-            a.ad.i(OfficeNamespace.cg, a5);
+            a.ad.h(OfficeNamespace.cg, a5);
         }
         if (nullableNotEquals(s, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(s.value));
-            a.ad.i(OfficeNamespace.a0, a5);
+            a.ad.h(OfficeNamespace.a0, a5);
         }
         if (nullableNotEquals(t, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(t.value));
-            a.ad.i(OfficeNamespace.bm, a5);
+            a.ad.h(OfficeNamespace.bm, a5);
         }
         if (nullableNotEquals(u, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(u.value));
-            a.ad.i(OfficeNamespace.br, a5);
+            a.ad.h(OfficeNamespace.br, a5);
         }
         if (nullableNotEquals(v, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(v.value));
-            a.ad.i(OfficeNamespace.bp, a5);
+            a.ad.h(OfficeNamespace.bp, a5);
         }
         if (nullableNotEquals(w, null)) {
             a5 = numberToString(w.value, CultureInfo.invariantCulture);
-            a.ad.i(OfficeNamespace.bq, a5);
+            a.ad.h(OfficeNamespace.bq, a5);
         }
         if (nullableNotEquals(x, null)) {
             a5 = XmlNamespaceDefinitionBase.p(ST_HrAlign_$type, x.value);
-            a.ad.i(OfficeNamespace.bn, a5);
+            a.ad.h(OfficeNamespace.bn, a5);
         }
         if (nullableNotEquals(y, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(y.value));
-            a.ad.i(OfficeNamespace.as, a5);
+            a.ad.h(OfficeNamespace.as, a5);
         }
         if (nullableNotEquals(z, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(z.value));
-            a.ad.i(OfficeNamespace.at, a5);
+            a.ad.h(OfficeNamespace.at, a5);
         }
         if (nullableNotEquals(aa, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(aa.value));
-            a.ad.i(OfficeNamespace.cf, a5);
+            a.ad.h(OfficeNamespace.cf, a5);
         }
         a5 = ab;
-        a.ad.i("bordertopcolor", a5);
+        a.ad.h("bordertopcolor", a5);
         a5 = ac;
-        a.ad.i("borderleftcolor", a5);
+        a.ad.h("borderleftcolor", a5);
         a5 = ad;
-        a.ad.i("borderbottomcolor", a5);
+        a.ad.h("borderbottomcolor", a5);
         a5 = ae;
-        a.ad.i("borderrightcolor", a5);
+        a.ad.h("borderrightcolor", a5);
         a5 = af;
-        a.ad.i(OfficeNamespace.be, a5);
+        a.ad.h(OfficeNamespace.be, a5);
         a5 = ag;
-        a.ad.i(OfficeNamespace.bg, a5);
+        a.ad.h(OfficeNamespace.bg, a5);
         a5 = ah;
-        a.ad.i(OfficeNamespace.bf, a5);
+        a.ad.h(OfficeNamespace.bf, a5);
         if (nullableNotEquals(ai, null)) {
             a5 = XmlNamespaceDefinitionBase.p(ST_InsetMode_$type, ai.value);
-            a.ad.i(OfficeNamespace.bt, a5);
+            a.ad.h(OfficeNamespace.bt, a5);
         }
         a5 = aj;
-        a.ad.i("chromakey", a5);
+        a.ad.h("chromakey", a5);
         if (nullableNotEquals(ak, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(ak.value));
-            a.ad.i("filled", a5);
+            a.ad.h("filled", a5);
         }
         a5 = al;
-        a.ad.i("fillcolor", a5);
+        a.ad.h("fillcolor", a5);
         a5 = am;
-        a.ad.i("opacity", a5);
+        a.ad.h("opacity", a5);
         if (nullableNotEquals(an, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(an.value));
-            a.ad.i("stroked", a5);
+            a.ad.h("stroked", a5);
         }
         a5 = ao;
-        a.ad.i("strokecolor", a5);
+        a.ad.h("strokecolor", a5);
         a5 = ap;
-        a.ad.i("strokeweight", a5);
+        a.ad.h("strokeweight", a5);
         if (nullableNotEquals(aq, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(aq.value));
-            a.ad.i("insetpen", a5);
+            a.ad.h("insetpen", a5);
         }
         if (nullableNotEquals(ar, null)) {
             a5 = numberToString(ar.value, CultureInfo.invariantCulture);
-            a.ad.i(OfficeNamespace.cb, a5);
+            a.ad.h(OfficeNamespace.cb, a5);
         }
         if (nullableNotEquals(as, null)) {
             a5 = XmlNamespaceDefinitionBase.p(ST_ConnectorType_$type, as.value);
-            a.ad.i(OfficeNamespace.a9, a5);
+            a.ad.h(OfficeNamespace.a9, a5);
         }
         if (nullableNotEquals(at, null)) {
             a5 = XmlNamespaceDefinitionBase.p(ST_BWMode_$type, at.value);
-            a.ad.i("bwmode", a5);
+            a.ad.h("bwmode", a5);
         }
         if (nullableNotEquals(au, null)) {
             a5 = XmlNamespaceDefinitionBase.p(ST_BWMode_$type, au.value);
-            a.ad.i("bwpure", a5);
+            a.ad.h("bwpure", a5);
         }
         if (nullableNotEquals(av, null)) {
             a5 = XmlNamespaceDefinitionBase.p(ST_BWMode_$type, av.value);
-            a.ad.i("bwnormal", a5);
+            a.ad.h("bwnormal", a5);
         }
         if (nullableNotEquals(aw, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(aw.value));
-            a.ad.i(OfficeNamespace.bj, a5);
+            a.ad.h(OfficeNamespace.bj, a5);
         }
         if (nullableNotEquals(ax, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(ax.value));
-            a.ad.i(OfficeNamespace.bx, a5);
+            a.ad.h(OfficeNamespace.bx, a5);
         }
         if (nullableNotEquals(ay, null)) {
             a5 = ST_TrueFalseBlank.f(ay.value);
-            a.ad.i(OfficeNamespace.bw, a5);
+            a.ad.h(OfficeNamespace.bw, a5);
         }
         if (nullableNotEquals(az, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(az.value));
-            a.ad.i(OfficeNamespace.b2, a5);
+            a.ad.h(OfficeNamespace.b2, a5);
         }
         if (nullableNotEquals(a0, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(a0.value));
-            a.ad.i(OfficeNamespace.a6, a5);
+            a.ad.h(OfficeNamespace.a6, a5);
         }
         if (nullableNotEquals(a1, null)) {
             a5 = ST_TrueFalse.k(ST_TrueFalse.b(a1.value));
-            a.ad.i(OfficeNamespace.a5, a5);
+            a.ad.h(OfficeNamespace.a5, a5);
         }
         a5 = a2;
-        a.ad.i("adj", a5);
+        a.ad.h("adj", a5);
         a5 = a3;
-        a.ad.i("path", a5);
+        a.ad.h("path", a5);
         a5 = a4;
-        a.ad.i("master", a5);
+        a.ad.h("master", a5);
     };
-    VmlNamespace.d1 = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad) {
-        var e_60, _0;
+    VmlNamespace.dw = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad) {
+        var e_59, _0;
         b = null;
         c = toNullable(Boolean_$type, null);
         d = null;
@@ -12452,8 +12324,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        catch (e_60_1) {
-            e_60 = { error: e_60_1 };
+        catch (e_59_1) {
+            e_59 = { error: e_59_1 };
         }
         finally {
             try {
@@ -12461,8 +12333,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                     _0.call(_1);
             }
             finally {
-                if (e_60)
-                    throw e_60.error;
+                if (e_59)
+                    throw e_59.error;
             }
         }
         return {
@@ -12497,7 +12369,7 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
             p29: ad
         };
     };
-    VmlNamespace.ec = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad) {
+    VmlNamespace.d5 = function (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, aa, ab, ac, ad) {
         if (b === void 0) {
             b = null;
         }
@@ -12585,101 +12457,101 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         if (ad === void 0) {
             ad = null;
         }
-        a.ad.q("urn:schemas-microsoft-com:vml/stroke", "v");
+        a.ad.p("urn:schemas-microsoft-com:vml/stroke", "v");
         var ae;
         ae = b;
-        a.ad.i("id", ae);
+        a.ad.h("id", ae);
         if (nullableNotEquals(c, null)) {
             ae = ST_TrueFalse.k(ST_TrueFalse.b(c.value));
-            a.ad.i("on", ae);
+            a.ad.h("on", ae);
         }
         ae = d;
-        a.ad.i("weight", ae);
+        a.ad.h("weight", ae);
         ae = e;
-        a.ad.i("color", ae);
+        a.ad.h("color", ae);
         ae = f;
-        a.ad.i("opacity", ae);
+        a.ad.h("opacity", ae);
         if (nullableNotEquals(g, null)) {
             ae = XmlNamespaceDefinitionBase.p(ST_StrokeLineStyle_$type, g.value);
-            a.ad.i("linestyle", ae);
+            a.ad.h("linestyle", ae);
         }
         if (nullableNotEquals(h, null)) {
             ae = numberToString(h.value, CultureInfo.invariantCulture);
-            a.ad.i("miterlimit", ae);
+            a.ad.h("miterlimit", ae);
         }
         if (nullableNotEquals(i, null)) {
             ae = XmlNamespaceDefinitionBase.p(ST_StrokeJoinStyle_$type, i.value);
-            a.ad.i("joinstyle", ae);
+            a.ad.h("joinstyle", ae);
         }
         if (nullableNotEquals(j, null)) {
             ae = XmlNamespaceDefinitionBase.p(ST_StrokeEndCap_$type, j.value);
-            a.ad.i("endcap", ae);
+            a.ad.h("endcap", ae);
         }
         ae = k;
-        a.ad.i("dashstyle", ae);
+        a.ad.h("dashstyle", ae);
         if (nullableNotEquals(l, null)) {
             ae = XmlNamespaceDefinitionBase.p(ST_FillType_$type, l.value);
-            a.ad.i("filltype", ae);
+            a.ad.h("filltype", ae);
         }
         ae = m;
-        a.ad.i("src", ae);
+        a.ad.h("src", ae);
         if (nullableNotEquals(n, null)) {
             ae = XmlNamespaceDefinitionBase.p(ST_ImageAspect_$type, n.value);
-            a.ad.i("imageaspect", ae);
+            a.ad.h("imageaspect", ae);
         }
         ae = o;
-        a.ad.i("imagesize", ae);
+        a.ad.h("imagesize", ae);
         if (nullableNotEquals(p, null)) {
             ae = ST_TrueFalse.k(ST_TrueFalse.b(p.value));
-            a.ad.i("imagealignshape", ae);
+            a.ad.h("imagealignshape", ae);
         }
         ae = q;
-        a.ad.i("color2", ae);
+        a.ad.h("color2", ae);
         if (nullableNotEquals(r, null)) {
             ae = XmlNamespaceDefinitionBase.p(ST_StrokeArrowType_$type, r.value);
-            a.ad.i("startarrow", ae);
+            a.ad.h("startarrow", ae);
         }
         if (nullableNotEquals(s, null)) {
             ae = XmlNamespaceDefinitionBase.p(ST_StrokeArrowWidth_$type, s.value);
-            a.ad.i("startarrowwidth", ae);
+            a.ad.h("startarrowwidth", ae);
         }
         if (nullableNotEquals(t, null)) {
             ae = XmlNamespaceDefinitionBase.p(ST_StrokeArrowLength_$type, t.value);
-            a.ad.i("startarrowlength", ae);
+            a.ad.h("startarrowlength", ae);
         }
         if (nullableNotEquals(u, null)) {
             ae = XmlNamespaceDefinitionBase.p(ST_StrokeArrowType_$type, u.value);
-            a.ad.i("endarrow", ae);
+            a.ad.h("endarrow", ae);
         }
         if (nullableNotEquals(v, null)) {
             ae = XmlNamespaceDefinitionBase.p(ST_StrokeArrowWidth_$type, v.value);
-            a.ad.i("endarrowwidth", ae);
+            a.ad.h("endarrowwidth", ae);
         }
         if (nullableNotEquals(w, null)) {
             ae = XmlNamespaceDefinitionBase.p(ST_StrokeArrowLength_$type, w.value);
-            a.ad.i("endarrowlength", ae);
+            a.ad.h("endarrowlength", ae);
         }
         ae = x;
-        a.ad.i(OfficeNamespace.bo, ae);
+        a.ad.h(OfficeNamespace.bo, ae);
         ae = y;
-        a.ad.i(OfficeNamespace.au, ae);
+        a.ad.h(OfficeNamespace.au, ae);
         ae = z;
-        a.ad.i(OfficeNamespace.cd, ae);
+        a.ad.h(OfficeNamespace.cd, ae);
         if (nullableNotEquals(aa, null)) {
             ae = ST_TrueFalse.k(ST_TrueFalse.b(aa.value));
-            a.ad.i(OfficeNamespace.bj, ae);
+            a.ad.h(OfficeNamespace.bj, ae);
         }
         ae = ab;
-        a.ad.i(OfficeDocumentRelationships.as, ae);
+        a.ad.h(OfficeDocumentRelationships.as, ae);
         if (nullableNotEquals(ac, null)) {
             ae = ST_TrueFalse.k(ST_TrueFalse.b(ac.value));
-            a.ad.i("insetpen", ae);
+            a.ad.h("insetpen", ae);
         }
         ae = ad;
-        a.ad.i(OfficeNamespace.b4, ae);
+        a.ad.h(OfficeNamespace.b4, ae);
     };
-    VmlNamespace.d2 = function (a, b, c, d, e, f) {
-        var e_61, _0;
+    VmlNamespace.dx = function (a, b, c, d, e, f) {
+        var e_60, _0;
         b = null;
         c = null;
         d = null;
@@ -12708,8 +12580,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        catch (e_61_1) {
-            e_61 = { error: e_61_1 };
+        catch (e_60_1) {
+            e_60 = { error: e_60_1 };
         }
         finally {
             try {
@@ -12717,8 +12589,8 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
                     _0.call(_1);
             }
             finally {
-                if (e_61)
-                    throw e_61.error;
+                if (e_60)
+                    throw e_60.error;
             }
         }
         return {
@@ -12729,7 +12601,7 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
             p5: f
         };
     };
-    VmlNamespace.ed = function (a, b, c, d, e, f) {
+    VmlNamespace.d6 = function (a, b, c, d, e, f) {
         if (b === void 0) {
             b = null;
         }
@@ -12745,21 +12617,21 @@ export var VmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         if (f === void 0) {
             f = toNullable(ST_InsetMode_$type, null);
         }
-        a.ad.q("urn:schemas-microsoft-com:vml/textbox", "v");
+        a.ad.p("urn:schemas-microsoft-com:vml/textbox", "v");
         var g;
         g = b;
-        a.ad.i("id", g);
+        a.ad.h("id", g);
         g = c;
-        a.ad.i("style", g);
+        a.ad.h("style", g);
         g = d;
-        a.ad.i("inset", g);
+        a.ad.h("inset", g);
         if (nullableNotEquals(e, null)) {
             g = ST_TrueFalse.k(ST_TrueFalse.b(e.value));
-            a.ad.i(OfficeNamespace.b9, g);
+            a.ad.h(OfficeNamespace.b9, g);
         }
         if (nullableNotEquals(f, null)) {
             g = XmlNamespaceDefinitionBase.p(ST_InsetMode_$type, f.value);
-            a.ad.i(OfficeNamespace.bt, g);
+            a.ad.h(OfficeNamespace.bt, g);
         }
     };
     VmlNamespace.$t = markType(VmlNamespace, 'VmlNamespace', XmlNamespaceDefinitionBase.$);
@@ -12793,7 +12665,7 @@ export var XmlNamespace = /** @class */ /*@__PURE__*/ (function (_super) {
         configurable: true
     });
     XmlNamespace.at = function (a) {
-        a.j("xml", "space", "http://www.w3.org/XML/1998/namespace", "preserve");
+        a.i("xml", "space", "http://www.w3.org/XML/1998/namespace", "preserve");
     };
     XmlNamespace.$t = markType(XmlNamespace, 'XmlNamespace', XmlNamespaceDefinitionBase.$);
     XmlNamespace.aq = "http://www.w3.org/XML/1998/namespace" + "/lang";