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

package/esm2015/lib/AlternateContentChoice_combined.js

@@ -5,11 +5,11 @@ https://www.infragistics.com/legal/license/igultimate-eula
 GOVERNS THE LICENSING, INSTALLATION AND USE OF INFRAGISTICS SOFTWARE. BY DOWNLOADING AND/OR INSTALLING AND USING INFRAGISTICS SOFTWARE:  you are indicating that you have read and understand this Agreement, and agree to be legally bound by it on behalf of the yourself and your company.
 */
 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";
@@ -123,24 +123,11 @@ let AlternateContentChoice = /*@__PURE__*/ (() => {
     class AlternateContentChoice extends Base {
         constructor(a, ..._rest) {
             super();
-            this.b = null;
             this.a = null;
+            this.b = null;
             a = (a == void 0) ? 0 : a;
             switch (a) {
                 case 0:
-                    {
-                        let c = _rest[0];
-                        let d = _rest[1];
-                        let e = [[c], () => WorkItem.c(d)];
-                        {
-                            let g = e[0];
-                            let h = e[1];
-                            this.b = h;
-                            this.a = g;
-                        }
-                    }
-                    break;
-                case 1:
                     {
                         let c = _rest[0];
                         let d = _rest[1];
@@ -148,30 +135,17 @@ let AlternateContentChoice = /*@__PURE__*/ (() => {
                         {
                             let g = e[0];
                             let h = e[1];
-                            this.b = h;
-                            this.a = g;
+                            this.a = h;
+                            this.b = g;
                         }
                     }
                     break;
-                case 2:
-                    {
-                        let c = _rest[0];
-                        let d = _rest[1];
-                        let e = [c, () => WorkItem.c(d)];
-                        {
-                            let g = e[0];
-                            let h = e[1];
-                            this.b = h;
-                            this.a = g;
-                        }
-                    }
-                    break;
-                case 3:
+                case 1:
                     {
                         let c = _rest[0];
                         let d = _rest[1];
-                        this.b = d;
-                        this.a = c;
+                        this.a = d;
+                        this.b = c;
                     }
                     break;
             }
@@ -1685,19 +1659,19 @@ let XmlWriteManager = /*@__PURE__*/ (() => {
     class XmlWriteManager extends Base {
         constructor(a, b) {
             super();
-            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;
         }
-        e(a) {
-            return this.x.a(a.s(this.b._ab));
+        d(a) {
+            return this.w.a(a.s(this.a._ab));
         }
-        f(a, b, c, d) {
+        e(a, b, c, d) {
             let e = a.lastIndexOf("/");
             if (e < 0) {
                 c = a;
@@ -1711,16 +1685,16 @@ let XmlWriteManager = /*@__PURE__*/ (() => {
             }
             c = a.substr(e + 1);
             d = a.substr(0, e);
-            if (this.b._ab != 1) {
-                let f = this.b._w(d);
+            if (this.a._ab != 1) {
+                let 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)) {
                 let g = d + "/";
-                b = this.x.a(g);
+                b = this.w.a(g);
                 if (stringIsNullOrEmpty(b) == false) {
                     d = g;
                 }
@@ -1731,127 +1705,126 @@ let XmlWriteManager = /*@__PURE__*/ (() => {
                 p3: d
             };
         }
-        g() {
-            if (this.d.count == 0) {
+        f() {
+            if (this.c.count == 0) {
                 return;
             }
-            this.m(MarkupCompatibility2006.ao);
-            this.i(MarkupCompatibility2006.at, stringJoin1(String_$type, " ", this.d));
-            this.d.clear();
-        }
-        h(a, b = null, c = true) {
-            WorkItemExtensions.o(this.a(a, () => b == null ? null : WorkItem.c(b), c));
+            this.l(MarkupCompatibility2006.ao);
+            this.h(MarkupCompatibility2006.at, stringJoin1(String_$type, " ", this.c));
+            this.c.clear();
         }
-        a(a, b = null, c = true) {
-            return WorkItemExtensions.c(Async.g(a != null, () => {
+        g(a, b = null, c = true) {
+            if (a != null) {
                 let d = new HashSet$1(XmlNamespaceDefinitionBase.$, 0);
                 for (let e of fromEnum(a)) {
-                    for (let f of fromEnum(Enumerable.u(XmlNamespaceDefinitionBase.$, e.a, (g) => this.e(g) == null))) {
+                    for (let f of fromEnum(Enumerable.u(XmlNamespaceDefinitionBase.$, e.b, (g) => this.d(g) == null))) {
                         d.add_1(f);
                     }
                 }
-                MarkupCompatibility2006.az(this.c);
+                MarkupCompatibility2006.az(this.b);
                 for (let g of fromEnum(d)) {
-                    this.m(g);
+                    this.l(g);
                 }
-                return Async.d(AlternateContentChoice.$, a, (h) => {
-                    MarkupCompatibility2006.a0(this.c, h.a);
-                    return WorkItemExtensions.a(h.b(), () => this.l());
-                });
-            }), () => WorkItemExtensions.a(Async.g(b != null, () => {
-                MarkupCompatibility2006.a2(this.c);
-                return WorkItemExtensions.a(b(), () => this.l());
-            }), () => {
-                if (c) {
-                    this.l();
+                for (let h of fromEnum(a)) {
+                    MarkupCompatibility2006.a0(this.b, h.b);
+                    h.a();
+                    this.k();
                 }
-            }));
+            }
+            if (b != null) {
+                MarkupCompatibility2006.a2(this.b);
+                b();
+                this.k();
+            }
+            if (c) {
+                this.k();
+            }
         }
-        i(a, b) {
+        h(a, b) {
             if (b == null) {
                 return;
             }
             let c;
             let d;
             let e;
-            let f = this.f(a, c, d, e);
+            let 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);
         }
-        j(a, b, c, d) {
-            this.x.j(a, b, c, d);
+        i(a, b, c, d) {
+            this.w.j(a, b, c, d);
         }
-        k(a, b) {
-            this.x.h(a, b);
+        j(a, b) {
+            this.w.h(a, b);
         }
-        l() {
-            this.g();
-            this.x.v();
+        k() {
+            this.f();
+            this.w.v();
         }
-        p(a) {
-            this.q(a, null);
+        o(a) {
+            this.p(a, null);
         }
-        q(a, b) {
+        p(a, b) {
             let c;
             let d;
             let e;
-            let f = this.f(a, c, d, e);
+            let 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);
         }
-        r(a, b, c) {
-            this.g();
-            this.x.ao(a, b, c);
+        q(a, b, c) {
+            this.f();
+            this.w.ao(a, b, c);
         }
-        s(a) {
-            this.x.am(a);
+        r(a) {
+            this.w.am(a);
         }
-        m(a, b = false) {
-            this.n(a.t, a.s(this.b._ab), b);
+        l(a, b = false) {
+            this.m(a.t, a.s(this.a._ab), b);
         }
-        n(a, b, c = false) {
+        m(a, b, c = false) {
             let d = b;
-            if (this.b._ab != 1) {
-                let e = this.b._w(b);
+            if (this.a._ab != 1) {
+                let 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);
             }
         }
-        o(a) {
-            this.g();
-            this.x.ah(a);
+        n(a) {
+            this.f();
+            this.w.ah(a);
         }
-        u(a) {
-            this.g();
+        t(a) {
+            this.f();
             let b = new Stack$1(UnknownElementCache.$);
-            this.t(a.b, b);
+            this.s(a.b, b);
         }
-        t(a, b) {
-            let c = this.c.y(a, b);
+        s(a, b) {
+            let c = this.b.y(a, b);
             let t1 = c;
             L0: while (true) {
                 switch (t1) {
                     case 0:
                         {
-                            let d = a.b.b(this.b);
-                            this.r(d.h, d.f, d.g);
+                            let d = a.b.b(this.a);
+                            this.q(d.h, d.f, d.g);
                             if (a.d) {
                                 for (let e of fromEnum(a.j)) {
-                                    let f = e.a.b(this.b);
-                                    this.j(f.h, f.f, f.g, e.d);
+                                    let f = e.a.b(this.a);
+                                    this.i(f.h, f.f, f.g, e.d);
                                 }
                             }
                             if (a.p != null) {
-                                this.v(a.p);
+                                this.u(a.p);
                             }
                         }
                         t1 = 1;
@@ -1861,11 +1834,11 @@ let XmlWriteManager = /*@__PURE__*/ (() => {
                             if (a.e) {
                                 b.h(a);
                                 for (let g of fromEnum(a.k)) {
-                                    this.t(g, b);
+                                    this.s(g, b);
                                 }
                                 b.e();
                             }
-                            this.l();
+                            this.k();
                         }
                         break;
                     case 2: break;
@@ -1876,12 +1849,12 @@ let XmlWriteManager = /*@__PURE__*/ (() => {
                 break;
             }
         }
-        v(a) {
-            this.g();
-            this.x.ap(a);
+        u(a) {
+            this.f();
+            this.w.ap(a);
         }
-        w(a, b, c) {
-            this.g();
+        v(a, b, c) {
+            this.f();
             let d = new StringBuilder(2, "version=\"" + a + "\"");
             if (b.length > 0) {
                 d.l(" encoding=\"");
@@ -1894,7 +1867,7 @@ let XmlWriteManager = /*@__PURE__*/ (() => {
                 d.l("\"");
             }
             let e = d.toString();
-            this.x.ad("xml", e);
+            this.w.ad("xml", e);
         }
     }
     XmlWriteManager.$t = /*@__PURE__*/ markType(XmlWriteManager, 'XmlWriteManager');
@@ -2081,7 +2054,7 @@ let XmlPartManagerBase = /*@__PURE__*/ (() => {
             return Async.n(XmlWriter.$, this.a2(), (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);
             });
@@ -2835,15 +2808,15 @@ let XmlNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             return c;
         }
         static aa(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());
         }
         static n(a, b) {
             return parseInt8_1(a.ab.ad, CultureInfo.invariantCulture);
         }
         static ab(a, b, c, d) {
-            a.ad.q(b, c);
-            a.ad.v(d.toString());
+            a.ad.p(b, c);
+            a.ad.u(d.toString());
         }
         static h(a, b) {
             let c = a.ao(XmlSchemaInstance.ar);
@@ -2851,31 +2824,31 @@ let XmlNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             return PackageUtilities.i(a.ab.ad);
         }
         static ac(a, b, c, d) {
-            a.ad.q(b, c);
+            a.ad.p(b, c);
             let 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));
         }
         static i(a, b) {
             return parseNumber(a.ab.ad, CultureInfo.invariantCulture);
         }
         static ad(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));
         }
         static j(a, b) {
             return parseNumber(a.ab.ad, CultureInfo.invariantCulture);
         }
         static ae(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));
         }
         static o(a, b) {
             return parseNumber(a.ab.ad, CultureInfo.invariantCulture);
         }
         static af(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));
         }
         static l(a, b, c = true) {
             let d = a.ab.ad;
@@ -2888,22 +2861,22 @@ let XmlNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             return e;
         }
         static ag(a, b, c, d) {
-            a.ad.q(b, c);
-            a.ad.v(d.toString());
+            a.ad.p(b, c);
+            a.ad.u(d.toString());
         }
         static m(a, b) {
             return parseInt64_1(a.ab.ad, CultureInfo.invariantCulture);
         }
         static ah(a, b, c, d) {
-            a.ad.q(b, c);
-            a.ad.v(d.toString());
+            a.ad.p(b, c);
+            a.ad.u(d.toString());
         }
         static k(a, b) {
             return parseInt16_1(a.ab.ad, CultureInfo.invariantCulture);
         }
         static ai(a, b, c, d) {
-            a.ad.q(b, c);
-            a.ad.v(d.toString());
+            a.ad.p(b, c);
+            a.ad.u(d.toString());
         }
         static d(a) {
             switch (a) {
@@ -2931,7 +2904,7 @@ let XmlNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             return e;
         }
         static aj(a, b, c, d, e = null, 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)) {
@@ -2942,35 +2915,35 @@ let XmlNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             if (e != null) {
                 e();
             }
-            a.ad.v(d);
+            a.ad.u(d);
         }
         static f(a, b) {
             return parseUInt8_1(a.ab.ad, CultureInfo.invariantCulture);
         }
         static ak(a, b, c, d) {
-            a.ad.q(b, c);
-            a.ad.v(d.toString());
+            a.ad.p(b, c);
+            a.ad.u(d.toString());
         }
         static w(a, b) {
             return parseUInt32_1(a.ab.ad, CultureInfo.invariantCulture);
         }
         static al(a, b, c, d) {
-            a.ad.q(b, c);
-            a.ad.v(d.toString());
+            a.ad.p(b, c);
+            a.ad.u(d.toString());
         }
         static x(a, b) {
             return parseUInt64_1(a.ab.ad, CultureInfo.invariantCulture);
         }
         static am(a, b, c, d) {
-            a.ad.q(b, c);
-            a.ad.v(d.toString());
+            a.ad.p(b, c);
+            a.ad.u(d.toString());
         }
         static v(a, b) {
             return parseUInt16_1(a.ab.ad, CultureInfo.invariantCulture);
         }
         static an(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 = /*@__PURE__*/ markType(XmlNamespaceDefinitionBase, 'XmlNamespaceDefinitionBase');
@@ -3017,13 +2990,13 @@ let CoreProperties = /*@__PURE__*/ (() => {
         static a0(a) {
         }
         static a7(a) {
-            a.ad.q(CoreProperties.as, "cp");
+            a.ad.p(CoreProperties.as, "cp");
             let 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);
         }
         static a1(a, b, c) {
             b = a.ao(XmlNamespace.aq);
@@ -3034,11 +3007,11 @@ let CoreProperties = /*@__PURE__*/ (() => {
             };
         }
         static a8(a, b, c) {
-            a.ad.q(CoreProperties.at, "cp");
+            a.ad.p(CoreProperties.at, "cp");
             let d;
             d = b;
-            a.ad.i(XmlNamespace.aq, d);
-            a.ad.v(c);
+            a.ad.h(XmlNamespace.aq, d);
+            a.ad.u(c);
         }
         static a2(a, b) {
             b = XmlNamespaceDefinitionBase.u(a, CoreProperties.au);
@@ -3216,8 +3189,8 @@ let Drawing2010Main = /*@__PURE__*/ (() => {
         s(a) {
             switch (a) {
                 case 0:
-                case 1: return Drawing2010Main.at;
-                default: return Drawing2010Main.at;
+                case 1: return Drawing2010Main.aq;
+                default: return Drawing2010Main.aq;
             }
         }
         get_t() {
@@ -3226,39 +3199,9 @@ let Drawing2010Main = /*@__PURE__*/ (() => {
         get t() {
             return this.get_t();
         }
-        av(a, b, c) {
-            b = null;
-            c = null;
-            for (let d of fromEnum(a.ab.u)) {
-                switch (d.a.e(a.d)) {
-                    case "cellRange":
-                        b = d.d;
-                        break;
-                    case "spid":
-                        c = d.d;
-                        break;
-                    default: break;
-                }
-            }
-            return {
-                p1: b,
-                p2: c
-            };
-        }
-        aw(a, b, c = null) {
-            a.ad.q(Drawing2010Main.aq, this.t);
-            let d;
-            d = b;
-            a.ad.i("cellRange", d);
-            if (c != null) {
-                d = c;
-                a.ad.i("spid", d);
-            }
-        }
     }
     Drawing2010Main.$t = /*@__PURE__*/ 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 = /*@__PURE__*/ new Drawing2010Main();
     return Drawing2010Main;
 })();
@@ -3288,10 +3231,10 @@ let Drawing2010Slicer = /*@__PURE__*/ (() => {
             };
         }
         static av(a, b) {
-            a.ad.q(Drawing2010Slicer.at, "sle");
+            a.ad.p(Drawing2010Slicer.at, "sle");
             let c;
             c = b;
-            a.ad.i("name", c);
+            a.ad.h("name", c);
         }
     }
     Drawing2010Slicer.$t = /*@__PURE__*/ markType(Drawing2010Slicer, 'Drawing2010Slicer', XmlNamespaceDefinitionBase.$);
@@ -3326,12 +3269,12 @@ let DrawingMLChart = /*@__PURE__*/ (() => {
             };
         }
         static gz(a, 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);
             let c;
             c = b;
-            a.ad.i(OfficeDocumentRelationships.as, c);
+            a.ad.h(OfficeDocumentRelationships.as, c);
         }
     }
     DrawingMLChart.$t = /*@__PURE__*/ markType(DrawingMLChart, 'DrawingMLChart', XmlNamespaceDefinitionBase.$);
@@ -3587,12 +3530,12 @@ let DrawingMLChart2014 = /*@__PURE__*/ (() => {
             };
         }
         static av(a, 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);
             let c;
             c = b;
-            a.ad.i(OfficeDocumentRelationships.as, c);
+            a.ad.h(OfficeDocumentRelationships.as, c);
         }
     }
     DrawingMLChart2014.$t = /*@__PURE__*/ markType(DrawingMLChart2014, 'DrawingMLChart2014', XmlNamespaceDefinitionBase.$);
@@ -3703,7 +3646,7 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
         get t() {
             return this.get_t();
         }
-        static kx(a, b, c) {
+        static kw(a, b, c) {
             let d = a.ao("val");
             if (d == null) {
                 c = ST_Angle.a(0);
@@ -3715,18 +3658,18 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static nz(a, b, c) {
-            a.ad.q(b, "a");
+        static nx(a, b, c) {
+            a.ad.p(b, "a");
             let d;
             d = c.toString();
-            a.ad.i("val", d);
+            a.ad.h("val", d);
         }
-        static ky(a, b) {
+        static kx(a, b) {
         }
-        static n0(a, b) {
-            a.ad.q(b, "a");
+        static ny(a, b) {
+            a.ad.p(b, "a");
         }
-        static kz(a, b, c) {
+        static ky(a, b, c) {
             let d = a.ao("val");
             if (d == null) {
                 c = new ST_FixedPercentage();
@@ -3738,13 +3681,13 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static n1(a, b, c) {
-            a.ad.q(b, "a");
+        static nz(a, b, c) {
+            a.ad.p(b, "a");
             let d;
             d = c.s(a.d._ab);
-            a.ad.i("val", d);
+            a.ad.h("val", d);
         }
-        static k0(a, b, c, d, e) {
+        static kz(a, b, c, d, e) {
             c = toNullable(ST_LineEndType_$type, null);
             d = toNullable(ST_LineEndWidth_$type, null);
             e = toNullable(ST_LineEndLength_$type, null);
@@ -3768,23 +3711,23 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        static n2(a, b, c, d, e) {
-            a.ad.q(b, "a");
+        static n0(a, b, c, d, e) {
+            a.ad.p(b, "a");
             let 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);
             }
         }
-        static k1(a, b, c, d, e, f, g) {
+        static k0(a, b, c, d, e, f, g) {
             c = new ST_DrawingElementId();
             d = null;
             e = null;
@@ -3818,23 +3761,23 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p6: g
             };
         }
-        static n3(a, b, c, d, e, f, g) {
-            a.ad.q(b, "a");
+        static n1(a, b, c, d, e, f, g) {
+            a.ad.p(b, "a");
             let 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);
         }
-        static k2(a, b, c) {
+        static k1(a, b, c) {
             let d = a.ao("val");
             if (d == null) {
                 c = new ST_Percentage();
@@ -3846,13 +3789,13 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static n4(a, b, c) {
-            a.ad.q(b, "a");
+        static n2(a, b, c) {
+            a.ad.p(b, "a");
             let d;
             d = c.r(a.d._ab);
-            a.ad.i("val", d);
+            a.ad.h("val", d);
         }
-        static k3(a, b, c, d) {
+        static k2(a, b, c, d) {
             c = new ST_Coordinate();
             d = new ST_Coordinate();
             for (let e of fromEnum(a.ab.u)) {
@@ -3871,15 +3814,15 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p3: d
             };
         }
-        static n5(a, b, c, d) {
-            a.ad.q(b, "a");
+        static n3(a, b, c, d) {
+            a.ad.p(b, "a");
             let 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);
         }
-        static k4(a, b, c) {
+        static k3(a, b, c) {
             let d = a.ao("val");
             if (d == null) {
                 c = ST_PositiveFixedAngle.e(ST_Angle.a(0));
@@ -3891,13 +3834,13 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static n6(a, b, c) {
-            a.ad.q(b, "a");
+        static n4(a, b, c) {
+            a.ad.p(b, "a");
             let d;
             d = c.toString();
-            a.ad.i("val", d);
+            a.ad.h("val", d);
         }
-        static k5(a, b, c) {
+        static k4(a, b, c) {
             let d = a.ao("val");
             if (d == null) {
                 c = new ST_PositiveFixedPercentage();
@@ -3909,13 +3852,13 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static n7(a, b, c) {
-            a.ad.q(b, "a");
+        static n5(a, b, c) {
+            a.ad.p(b, "a");
             let d;
             d = c.u(a.d._ab);
-            a.ad.i("val", d);
+            a.ad.h("val", d);
         }
-        static k6(a, b, c) {
+        static k5(a, b, c) {
             let d = a.ao("val");
             if (d == null) {
                 c = new ST_PositivePercentage();
@@ -3927,13 +3870,13 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static n8(a, b, c) {
-            a.ad.q(b, "a");
+        static n6(a, b, c) {
+            a.ad.p(b, "a");
             let d;
             d = c.s(a.d._ab);
-            a.ad.i("val", d);
+            a.ad.h("val", d);
         }
-        static k7(a, b, c, d) {
+        static k6(a, b, c, d) {
             c = new ST_PositiveCoordinate();
             d = new ST_PositiveCoordinate();
             for (let e of fromEnum(a.ab.u)) {
@@ -3952,15 +3895,15 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p3: d
             };
         }
-        static n9(a, b, c, d) {
-            a.ad.q(b, "a");
+        static n7(a, b, c, d) {
+            a.ad.p(b, "a");
             let 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);
         }
-        static k8(a, b, c, d, e, f) {
+        static k7(a, b, c, d, e, f) {
             c = ST_Percentage.b(0);
             d = ST_Percentage.b(0);
             e = ST_Percentage.b(0);
@@ -3990,28 +3933,28 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p5: f
             };
         }
-        static oa(a, b, c, d, e, f) {
-            a.ad.q(b, "a");
+        static n8(a, b, c, d, e, f) {
+            a.ad.p(b, "a");
             let g;
             let 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);
             }
         }
-        static k9(a, b, c) {
+        static k8(a, b, c) {
             let d = a.ao("idx");
             if (d == null) {
                 c = 0;
@@ -4023,13 +3966,13 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static ob(a, b, c) {
-            a.ad.q(b, "a");
+        static n9(a, b, c) {
+            a.ad.p(b, "a");
             let d;
             d = c.toString();
-            a.ad.i("idx", d);
+            a.ad.h("idx", d);
         }
-        static la(a, b, c, d, e, f, g = true) {
+        static k9(a, b, c, d, e, f, g = true) {
             c = null;
             d = null;
             e = toNullable(Number_$type, null);
@@ -4062,90 +4005,90 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p5: f
             };
         }
-        static oc(a, b, c, d, e, f) {
-            a.ad.q(b, "a");
+        static oa(a, b, c, d, e, f) {
+            a.ad.p(b, "a");
             let 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);
             }
         }
+        static kb(a) {
+        }
+        static nc(a) {
+            DrawingMLMain.ny(a, DrawingMLMain.ar);
+        }
         static kc(a) {
         }
-        static ne(a) {
-            DrawingMLMain.n0(a, DrawingMLMain.ar);
+        static nd(a) {
+            DrawingMLMain.ny(a, DrawingMLMain.as);
         }
         static kd(a) {
         }
-        static nf(a) {
-            DrawingMLMain.n0(a, DrawingMLMain.as);
+        static ne(a) {
+            DrawingMLMain.ny(a, DrawingMLMain.at);
         }
         static ke(a) {
         }
-        static ng(a) {
-            DrawingMLMain.n0(a, DrawingMLMain.at);
+        static nf(a) {
+            DrawingMLMain.ny(a, DrawingMLMain.au);
         }
         static kf(a) {
         }
-        static nh(a) {
-            DrawingMLMain.n0(a, DrawingMLMain.au);
+        static ng(a) {
+            DrawingMLMain.ny(a, DrawingMLMain.av);
         }
         static kg(a) {
         }
-        static ni(a) {
-            DrawingMLMain.n0(a, DrawingMLMain.av);
-        }
-        static kh(a) {
-        }
-        static nj(a) {
-            DrawingMLMain.n0(a, DrawingMLMain.aw);
+        static nh(a) {
+            DrawingMLMain.ny(a, DrawingMLMain.aw);
         }
-        static ki(a, b) {
-            let c = DrawingMLMain.k5(a, DrawingMLMain.a2, b);
+        static kh(a, b) {
+            let c = DrawingMLMain.k4(a, DrawingMLMain.a2, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static nk(a, b) {
-            DrawingMLMain.n7(a, DrawingMLMain.a2, b);
+        static ni(a, b) {
+            DrawingMLMain.n5(a, DrawingMLMain.a2, b);
         }
-        static kj(a, b) {
-            let c = DrawingMLMain.k6(a, DrawingMLMain.a7, b);
+        static ki(a, b) {
+            let c = DrawingMLMain.k5(a, DrawingMLMain.a7, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static nl(a, b) {
-            DrawingMLMain.n8(a, DrawingMLMain.a7, b);
+        static nj(a, b) {
+            DrawingMLMain.n6(a, DrawingMLMain.a7, b);
         }
-        static kk(a, b) {
-            let c = DrawingMLMain.kz(a, DrawingMLMain.a9, b);
+        static kj(a, b) {
+            let c = DrawingMLMain.ky(a, DrawingMLMain.a9, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static nm(a, b) {
-            DrawingMLMain.n1(a, DrawingMLMain.a9, b);
+        static nk(a, b) {
+            DrawingMLMain.nz(a, DrawingMLMain.a9, b);
         }
-        static kl(a) {
+        static kk(a) {
         }
-        static nn(a) {
-            a.ad.q(DrawingMLMain.bh, "a");
+        static nl(a) {
+            a.ad.p(DrawingMLMain.bh, "a");
         }
-        static km(a, b, c, d, e = true) {
+        static kl(a, b, c, d, e = true) {
             b = null;
             c = null;
             if (e) {
@@ -4174,19 +4117,19 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p3: d
             };
         }
-        static no(a, b, c, d) {
-            a.ad.q(DrawingMLMain.bt, "a");
+        static nm(a, b, c, d) {
+            a.ad.p(DrawingMLMain.bt, "a");
             let 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);
             }
         }
-        static kn(a, b, c) {
+        static km(a, b, c) {
             b = toNullable(Number_$type, null);
             c = toNullable(Boolean_$type, null);
             for (let d of fromEnum(a.ab.u)) {
@@ -4205,49 +4148,49 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static np(a, b = toNullable(Number_$type, null), c = toNullable(Boolean_$type, null)) {
-            a.ad.q(DrawingMLMain.bu, "a");
+        static nn(a, b = toNullable(Number_$type, null), c = toNullable(Boolean_$type, null)) {
+            a.ad.p(DrawingMLMain.bu, "a");
             let 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);
             }
         }
-        static ko(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.bv, b);
+        static kn(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.bv, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static nq(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.bv, b);
+        static no(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.bv, b);
         }
-        static kp(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.bw, b);
+        static ko(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.bw, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static nr(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.bw, b);
+        static np(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.bw, b);
         }
-        static kq(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.bx, b);
+        static kp(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.bx, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static ns(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.bx, b);
+        static nq(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.bx, b);
         }
-        static kr(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) {
+        static kq(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) {
             b = toNullable(Number_$type, null);
             c = toNullable(Boolean_$type, null);
             d = toNullable(ST_TextVertOverflowType_$type, null);
@@ -4351,88 +4294,88 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p19: t
             };
         }
-        static nt(a, b = toNullable(Number_$type, null), c = toNullable(Boolean_$type, null), d = toNullable(ST_TextVertOverflowType_$type, null), e = toNullable(ST_TextHorzOverflowType_$type, null), f = toNullable(ST_TextVerticalType_$type, null), g = toNullable(ST_TextWrappingType_$type, null), h = toNullable(ST_Coordinate32.$, null), i = toNullable(ST_Coordinate32.$, null), j = toNullable(ST_Coordinate32.$, null), k = toNullable(ST_Coordinate32.$, null), l = toNullable(Number_$type, null), m = toNullable(Number_$type, null), n = toNullable(Boolean_$type, null), o = toNullable(Boolean_$type, null), p = toNullable(ST_TextAnchoringType_$type, null), q = toNullable(Boolean_$type, null), r = toNullable(Boolean_$type, null), s = false, t = toNullable(Boolean_$type, null)) {
-            a.ad.q(DrawingMLMain.b0, "a");
+        static nr(a, b = toNullable(Number_$type, null), c = toNullable(Boolean_$type, null), d = toNullable(ST_TextVertOverflowType_$type, null), e = toNullable(ST_TextHorzOverflowType_$type, null), f = toNullable(ST_TextVerticalType_$type, null), g = toNullable(ST_TextWrappingType_$type, null), h = toNullable(ST_Coordinate32.$, null), i = toNullable(ST_Coordinate32.$, null), j = toNullable(ST_Coordinate32.$, null), k = toNullable(ST_Coordinate32.$, null), l = toNullable(Number_$type, null), m = toNullable(Number_$type, null), n = toNullable(Boolean_$type, null), o = toNullable(Boolean_$type, null), p = toNullable(ST_TextAnchoringType_$type, null), q = toNullable(Boolean_$type, null), r = toNullable(Boolean_$type, null), s = false, t = toNullable(Boolean_$type, null)) {
+            a.ad.p(DrawingMLMain.b0, "a");
             let 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);
             }
         }
-        static ks(a, b, c) {
-            let d = DrawingMLMain.k7(a, DrawingMLMain.ch, b, c);
+        static kr(a, b, c) {
+            let d = DrawingMLMain.k6(a, DrawingMLMain.ch, b, c);
             b = d.p2;
             c = d.p3;
             return {
@@ -4440,11 +4383,11 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static nu(a, b, c) {
-            DrawingMLMain.n9(a, DrawingMLMain.ch, b, c);
+        static ns(a, b, c) {
+            DrawingMLMain.n7(a, DrawingMLMain.ch, b, c);
         }
-        static kt(a, b, c) {
-            let d = DrawingMLMain.k3(a, DrawingMLMain.ci, b, c);
+        static ks(a, b, c) {
+            let d = DrawingMLMain.k2(a, DrawingMLMain.ci, b, c);
             b = d.p2;
             c = d.p3;
             return {
@@ -4452,28 +4395,28 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static nv(a, b, c) {
-            DrawingMLMain.n5(a, DrawingMLMain.ci, b, c);
+        static nt(a, b, c) {
+            DrawingMLMain.n3(a, DrawingMLMain.ci, b, c);
         }
-        static ku(a, b) {
+        static kt(a, b) {
             b = a.ao("name");
             return {
                 p1: b
             };
         }
-        static nw(a, b) {
-            a.ad.q(DrawingMLMain.cn, "a");
+        static nu(a, b) {
+            a.ad.p(DrawingMLMain.cn, "a");
             let c;
             c = b;
-            a.ad.i("name", c);
+            a.ad.h("name", c);
         }
-        static kv(a) {
+        static ku(a) {
         }
-        static nx(a) {
-            a.ad.q(DrawingMLMain.cq, "a");
+        static nv(a) {
+            a.ad.p(DrawingMLMain.cq, "a");
         }
-        static kw(a, b, c, d, e, f = true) {
-            let g = DrawingMLMain.la(a, DrawingMLMain.cu, b, c, d, e);
+        static kv(a, b, c, d, e, f = true) {
+            let g = DrawingMLMain.k9(a, DrawingMLMain.cu, b, c, d, e);
             b = g.p2;
             c = g.p3;
             d = g.p4;
@@ -4485,10 +4428,10 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        static ny(a, b, c = null, d = toNullable(Number_$type, null), e = 1) {
-            DrawingMLMain.oc(a, DrawingMLMain.cu, b, c, d, e);
+        static nw(a, b, c = null, d = toNullable(Number_$type, null), e = 1) {
+            DrawingMLMain.oa(a, DrawingMLMain.cu, b, c, d, e);
         }
-        static lb(a, b) {
+        static la(a, b) {
             let c = a.ao("name");
             if (c == null) {
                 b = "";
@@ -4500,32 +4443,32 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p1: b
             };
         }
-        static od(a, b = "") {
-            a.ad.q(DrawingMLMain.cx, "a");
+        static ob(a, b = "") {
+            a.ad.p(DrawingMLMain.cx, "a");
             let c;
             if (b != "") {
                 c = b;
-                a.ad.i("name", c);
+                a.ad.h("name", c);
             }
         }
-        static lc(a) {
+        static lb(a) {
         }
-        static oe(a) {
-            a.ad.q(DrawingMLMain.cy, "a");
+        static oc(a) {
+            a.ad.p(DrawingMLMain.cy, "a");
         }
-        static ld(a) {
+        static lc(a) {
         }
-        static of(a) {
-            DrawingMLMain.n0(a, DrawingMLMain.da);
+        static od(a) {
+            DrawingMLMain.ny(a, DrawingMLMain.da);
         }
-        static le(a) {
+        static ld(a) {
         }
-        static og(a) {
-            DrawingMLMain.n0(a, DrawingMLMain.db);
+        static oe(a) {
+            DrawingMLMain.ny(a, DrawingMLMain.db);
         }
-        static lf(a, b, c, d, e) {
+        static le(a, b, c, d, e) {
             let f = toNullable(Number_$type, null);
-            let g = DrawingMLMain.la(a, DrawingMLMain.df, b, c, d, f);
+            let g = DrawingMLMain.k9(a, DrawingMLMain.df, b, c, d, f);
             b = g.p2;
             c = g.p3;
             d = g.p4;
@@ -4538,21 +4481,21 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        static oh(a, b, c = null, d = toNullable(Number_$type, null), e = 1) {
-            DrawingMLMain.oc(a, DrawingMLMain.df, b, c, d, e);
+        static of(a, b, c = null, d = toNullable(Number_$type, null), e = 1) {
+            DrawingMLMain.oa(a, DrawingMLMain.df, b, c, d, e);
         }
-        static lg(a, b) {
-            let c = DrawingMLMain.k9(a, DrawingMLMain.dk, b);
+        static lf(a, b) {
+            let c = DrawingMLMain.k8(a, DrawingMLMain.dk, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static oi(a, b) {
-            DrawingMLMain.ob(a, DrawingMLMain.dk, b);
+        static og(a, b) {
+            DrawingMLMain.n9(a, DrawingMLMain.dk, b);
         }
-        static lh(a, b, c) {
-            let d = DrawingMLMain.k7(a, DrawingMLMain.dr, b, c);
+        static lg(a, b, c) {
+            let d = DrawingMLMain.k6(a, DrawingMLMain.dr, b, c);
             b = d.p2;
             c = d.p3;
             return {
@@ -4560,42 +4503,26 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static oj(a, b, c) {
-            DrawingMLMain.n9(a, DrawingMLMain.dr, b, c);
+        static oh(a, b, c) {
+            DrawingMLMain.n7(a, DrawingMLMain.dr, b, c);
         }
-        static ll(a, b) {
-            b = a.ao("uri");
-            return {
-                p1: b
-            };
+        static lh(a) {
         }
-        static on(a, b, c = null) {
-            a.ad.q(DrawingMLMain.dr, "a");
-            let d;
-            d = b;
-            a.ad.i("uri", d);
-            if (stringIsNullOrEmpty(c) == false) {
-                d = c;
-                a.ad.j("xmlns", "x14", null, d);
-            }
+        static oi(a) {
+            a.ad.p(DrawingMLMain.ds, "a");
         }
         static li(a) {
         }
-        static ok(a) {
-            a.ad.q(DrawingMLMain.ds, "a");
+        static oj(a) {
+            a.ad.p(DrawingMLMain.dt, "a");
         }
         static lj(a) {
         }
-        static ol(a) {
-            a.ad.q(DrawingMLMain.dt, "a");
-        }
-        static lk(a) {
-        }
-        static om(a) {
-            a.ad.q(DrawingMLMain.du, "a");
+        static ok(a) {
+            a.ad.p(DrawingMLMain.du, "a");
         }
-        static lm(a, b, c, d, e) {
-            let f = DrawingMLMain.k8(a, DrawingMLMain.dz, b, c, d, e);
+        static lk(a, b, c, d, e) {
+            let f = DrawingMLMain.k7(a, DrawingMLMain.dz, b, c, d, e);
             b = f.p2;
             c = f.p3;
             d = f.p4;
@@ -4607,25 +4534,25 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        static oo(a, b, c, d, e) {
-            DrawingMLMain.oa(a, DrawingMLMain.dz, b, c, d, e);
+        static ol(a, b, c, d, e) {
+            DrawingMLMain.n8(a, DrawingMLMain.dz, b, c, d, e);
         }
-        static ln(a, b) {
-            let c = DrawingMLMain.k9(a, DrawingMLMain.d0, b);
+        static ll(a, b) {
+            let c = DrawingMLMain.k8(a, DrawingMLMain.d0, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static op(a, b) {
-            DrawingMLMain.ob(a, DrawingMLMain.d0, b);
+        static om(a, b) {
+            DrawingMLMain.n9(a, DrawingMLMain.d0, b);
         }
-        static lo(a) {
+        static lm(a) {
         }
-        static oq(a) {
-            DrawingMLMain.n0(a, DrawingMLMain.d9);
+        static on(a) {
+            DrawingMLMain.ny(a, DrawingMLMain.d9);
         }
-        static lp(a, b, c) {
+        static ln(a, b, c) {
             b = null;
             c = null;
             for (let d of fromEnum(a.ab.u)) {
@@ -4644,15 +4571,15 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static or(a, b, c) {
-            a.ad.q(DrawingMLMain.ea, "a");
+        static oo(a, b, c) {
+            a.ad.p(DrawingMLMain.ea, "a");
             let 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);
         }
-        static lq(a, b) {
+        static lo(a, b) {
             b = 0;
             let c = a.ao("idx");
             if (c != null) {
@@ -4662,25 +4589,25 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p1: b
             };
         }
-        static os(a, b) {
-            a.ad.q(DrawingMLMain.ec, "a");
+        static op(a, b) {
+            a.ad.p(DrawingMLMain.ec, "a");
             let c;
             c = XmlNamespaceDefinitionBase.p(ST_FontCollectionIndex_$type, b);
-            a.ad.i("idx", c);
+            a.ad.h("idx", c);
         }
-        static lr(a, b) {
+        static lp(a, b) {
             b = a.ao("name");
             return {
                 p1: b
             };
         }
-        static ot(a, b) {
-            a.ad.q(DrawingMLMain.ed, "a");
+        static oq(a, b) {
+            a.ad.p(DrawingMLMain.ed, "a");
             let c;
             c = b;
-            a.ad.i("name", c);
+            a.ad.h("name", c);
         }
-        static ls(a, b, c) {
+        static lq(a, b, c) {
             b = null;
             c = null;
             for (let d of fromEnum(a.ab.u)) {
@@ -4699,32 +4626,32 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static ou(a, b, c) {
-            a.ad.q(DrawingMLMain.eh, "a");
+        static or(a, b, c) {
+            a.ad.p(DrawingMLMain.eh, "a");
             let 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);
         }
-        static lt(a, b) {
+        static lr(a, b) {
             b = a.ao("uri");
             return {
                 p1: b
             };
         }
-        static ov(a, b) {
-            a.ad.q(DrawingMLMain.em, "a");
+        static os(a, b) {
+            a.ad.p(DrawingMLMain.em, "a");
             let c;
             c = b;
-            a.ad.i("uri", c);
+            a.ad.h("uri", c);
         }
-        static lu(a) {
+        static ls(a) {
         }
-        static ow(a) {
-            a.ad.q(DrawingMLMain.el, "a");
+        static ot(a) {
+            a.ad.p(DrawingMLMain.el, "a");
         }
-        static lv(a, b, c, d, e, f, g) {
+        static lt(a, b, c, d, e, f, g) {
             b = false;
             c = false;
             d = false;
@@ -4763,76 +4690,76 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p6: g
             };
         }
-        static ox(a, b = false, c = false, d = false, e = false, f = false, g = false) {
-            a.ad.q(DrawingMLMain.en, "a");
+        static ou(a, b = false, c = false, d = false, e = false, f = false, g = false) {
+            a.ad.p(DrawingMLMain.en, "a");
             let 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);
             }
         }
-        static lw(a) {
+        static lu(a) {
         }
-        static oy(a) {
-            a.ad.q(DrawingMLMain.eo, "a");
+        static ov(a) {
+            a.ad.p(DrawingMLMain.eo, "a");
         }
-        static lx(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.eq, b);
+        static lv(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.eq, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static oz(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.eq, b);
+        static ow(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.eq, b);
         }
-        static ly(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.er, b);
+        static lw(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.er, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static o0(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.er, b);
+        static ox(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.er, b);
         }
-        static lz(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.es, b);
+        static lx(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.es, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static o1(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.es, b);
+        static oy(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.es, b);
         }
-        static l0(a) {
+        static ly(a) {
         }
-        static o2(a) {
-            a.ad.q(DrawingMLMain.et, "a");
+        static oz(a) {
+            a.ad.p(DrawingMLMain.et, "a");
         }
-        static l1(a, b, c, d) {
-            let e = DrawingMLMain.k0(a, DrawingMLMain.ex, b, c, d);
+        static lz(a, b, c, d) {
+            let e = DrawingMLMain.kz(a, DrawingMLMain.ex, b, c, d);
             b = e.p2;
             c = e.p3;
             d = e.p4;
@@ -4842,10 +4769,10 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p3: d
             };
         }
-        static o3(a, b, c, d) {
-            DrawingMLMain.n2(a, DrawingMLMain.ex, b, c, d);
+        static o0(a, b, c, d) {
+            DrawingMLMain.n0(a, DrawingMLMain.ex, b, c, d);
         }
-        static l2(a, b, c, d, e, f, g, h, i) {
+        static l0(a, b, c, d, e, f, g, h, i) {
             b = null;
             c = "";
             d = "";
@@ -4894,75 +4821,75 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p8: i
             };
         }
-        static o4(a, b = null, c = "", d = "", e = "", f = "", g = true, h = false, i = false) {
-            a.ad.q(DrawingMLMain.e3, "a");
+        static o1(a, b = null, c = "", d = "", e = "", f = "", g = true, h = false, i = false) {
+            a.ad.p(DrawingMLMain.e3, "a");
             let 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);
             }
         }
-        static l3(a) {
+        static l1(a) {
         }
-        static o5(a) {
-            DrawingMLMain.n0(a, DrawingMLMain.e2);
+        static o2(a) {
+            DrawingMLMain.ny(a, DrawingMLMain.e2);
         }
-        static l4(a, b) {
-            let c = DrawingMLMain.k4(a, DrawingMLMain.e9, b);
+        static l2(a, b) {
+            let c = DrawingMLMain.k3(a, DrawingMLMain.e9, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static o6(a, b) {
-            DrawingMLMain.n6(a, DrawingMLMain.e9, b);
+        static o3(a, b) {
+            DrawingMLMain.n4(a, DrawingMLMain.e9, b);
         }
-        static l5(a, b) {
-            let c = DrawingMLMain.k6(a, DrawingMLMain.fa, b);
+        static l3(a, b) {
+            let c = DrawingMLMain.k5(a, DrawingMLMain.fa, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static o7(a, b) {
-            DrawingMLMain.n8(a, DrawingMLMain.fa, b);
+        static o4(a, b) {
+            DrawingMLMain.n6(a, DrawingMLMain.fa, b);
         }
-        static l6(a, b) {
-            let c = DrawingMLMain.kx(a, DrawingMLMain.fb, b);
+        static l4(a, b) {
+            let c = DrawingMLMain.kw(a, DrawingMLMain.fb, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static o8(a, b) {
-            DrawingMLMain.nz(a, DrawingMLMain.fb, b);
+        static o5(a, b) {
+            DrawingMLMain.nx(a, DrawingMLMain.fb, b);
         }
-        static l7(a) {
+        static l5(a) {
         }
-        static o9(a) {
-            a.ad.q(DrawingMLMain.fh, "a");
+        static o6(a) {
+            a.ad.p(DrawingMLMain.fh, "a");
         }
-        static l8(a, b, c, d, e) {
+        static l6(a, b, c, d, e) {
             let f = toNullable(Number_$type, null);
-            let g = DrawingMLMain.la(a, DrawingMLMain.fr, b, c, d, f);
+            let g = DrawingMLMain.k9(a, DrawingMLMain.fr, b, c, d, f);
             b = g.p2;
             c = g.p3;
             d = g.p4;
@@ -4975,10 +4902,10 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        static pa(a, b, c = null, d = toNullable(Number_$type, null), e = 1) {
-            DrawingMLMain.oc(a, DrawingMLMain.fr, b, c, d, e);
+        static o7(a, b, c = null, d = toNullable(Number_$type, null), e = 1) {
+            DrawingMLMain.oa(a, DrawingMLMain.fr, b, c, d, e);
         }
-        static l9(a, b, c, d, e) {
+        static l7(a, b, c, d, e) {
             b = toNullable(ST_LineWidth.$, null);
             c = toNullable(ST_LineCap_$type, null);
             d = toNullable(ST_CompoundLine_$type, null);
@@ -5007,103 +4934,103 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        static pb(a, b, c, d, e) {
-            a.ad.q(DrawingMLMain.fx, "a");
+        static o8(a, b, c, d, e) {
+            a.ad.p(DrawingMLMain.fx, "a");
             let 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);
             }
         }
-        static ma(a, b) {
-            let c = DrawingMLMain.k9(a, DrawingMLMain.fy, b);
+        static l8(a, b) {
+            let c = DrawingMLMain.k8(a, DrawingMLMain.fy, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static pc(a, b) {
-            DrawingMLMain.ob(a, DrawingMLMain.fy, b);
+        static o9(a, b) {
+            DrawingMLMain.n9(a, DrawingMLMain.fy, b);
         }
-        static mb(a) {
+        static l9(a) {
         }
-        static pd(a) {
-            a.ad.q(DrawingMLMain.f2, "a");
+        static pa(a) {
+            a.ad.p(DrawingMLMain.f2, "a");
         }
-        static mc(a) {
+        static ma(a) {
         }
-        static pe(a) {
-            DrawingMLMain.n0(a, DrawingMLMain.f3);
+        static pb(a) {
+            DrawingMLMain.ny(a, DrawingMLMain.f3);
         }
-        static md(a) {
+        static mb(a) {
         }
-        static pf(a) {
-            DrawingMLMain.n0(a, DrawingMLMain.f4);
+        static pc(a) {
+            DrawingMLMain.ny(a, DrawingMLMain.f4);
         }
-        static me(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.f5, b);
+        static mc(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.f5, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static pg(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.f5, b);
+        static pd(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.f5, b);
         }
-        static mf(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.f6, b);
+        static md(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.f6, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static ph(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.f6, b);
+        static pe(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.f6, b);
         }
-        static mg(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.f7, b);
+        static me(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.f7, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static pi(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.f7, b);
+        static pf(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.f7, b);
         }
-        static mh(a) {
+        static mf(a) {
         }
-        static pj(a) {
-            a.ad.q(DrawingMLMain.gi, "a");
+        static pg(a) {
+            a.ad.p(DrawingMLMain.gi, "a");
         }
-        static mi(a) {
+        static mg(a) {
         }
-        static pk(a) {
-            a.ad.q(DrawingMLMain.gl, "a");
+        static ph(a) {
+            a.ad.p(DrawingMLMain.gl, "a");
         }
-        static mj(a) {
+        static mh(a) {
         }
-        static pl(a) {
-            a.ad.q(DrawingMLMain.gz, "a");
+        static pi(a) {
+            a.ad.p(DrawingMLMain.gz, "a");
         }
-        static mk(a) {
+        static mi(a) {
         }
-        static pm(a) {
-            a.ad.q(DrawingMLMain.hb, "a");
+        static pj(a) {
+            a.ad.p(DrawingMLMain.hb, "a");
         }
-        static ml(a, b, c) {
-            let d = DrawingMLMain.k3(a, DrawingMLMain.hc, b, c);
+        static mj(a, b, c) {
+            let d = DrawingMLMain.k2(a, DrawingMLMain.hc, b, c);
             b = d.p2;
             c = d.p3;
             return {
@@ -5111,15 +5038,15 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static pn(a, b, c) {
-            DrawingMLMain.n5(a, DrawingMLMain.hc, b, c);
+        static pk(a, b, c) {
+            DrawingMLMain.n3(a, DrawingMLMain.hc, b, c);
         }
-        static mm(a) {
+        static mk(a) {
         }
-        static po(a) {
-            a.ad.q(DrawingMLMain.he, "a");
+        static pl(a) {
+            a.ad.p(DrawingMLMain.he, "a");
         }
-        static mn(a, b, c, d, e, f, g, h, i, j, k, l) {
+        static ml(a, b, c, d, e, f, g, h, i, j, k, l) {
             b = false;
             c = false;
             d = false;
@@ -5183,55 +5110,55 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p11: l
             };
         }
-        static pp(a, b = false, c = false, d = false, e = false, f = false, g = false, h = false, i = false, j = false, k = false, l = false) {
-            a.ad.q(DrawingMLMain.hj, "a");
+        static pm(a, b = false, c = false, d = false, e = false, f = false, g = false, h = false, i = false, j = false, k = false, l = false) {
+            a.ad.p(DrawingMLMain.hj, "a");
             let 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);
             }
         }
-        static mo(a, b, c, d, e, f, g, h, i, j, k, l) {
+        static mm(a, b, c, d, e, f, g, h, i, j, k, l) {
             b = toNullable(ST_TextMargin.$, null);
             c = toNullable(ST_TextMargin.$, null);
             d = toNullable(ST_TextIndentLevelType.$, null);
@@ -5295,55 +5222,55 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p11: l
             };
         }
-        static pq(a, b = toNullable(ST_TextMargin.$, null), c = toNullable(ST_TextMargin.$, null), d = toNullable(ST_TextIndentLevelType.$, null), e = toNullable(ST_TextIndent.$, null), f = toNullable(ST_TextAlignType_$type, null), g = toNullable(ST_Coordinate32.$, null), h = toNullable(Boolean_$type, null), i = toNullable(Boolean_$type, null), j = toNullable(ST_TextFontAlignType_$type, null), k = toNullable(Boolean_$type, null), l = toNullable(Boolean_$type, null)) {
-            a.ad.q(DrawingMLMain.hm, "a");
+        static pn(a, b = toNullable(ST_TextMargin.$, null), c = toNullable(ST_TextMargin.$, null), d = toNullable(ST_TextIndentLevelType.$, null), e = toNullable(ST_TextIndent.$, null), f = toNullable(ST_TextAlignType_$type, null), g = toNullable(ST_Coordinate32.$, null), h = toNullable(Boolean_$type, null), i = toNullable(Boolean_$type, null), j = toNullable(ST_TextFontAlignType_$type, null), k = toNullable(Boolean_$type, null), l = toNullable(Boolean_$type, null)) {
+            a.ad.p(DrawingMLMain.hm, "a");
             let 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);
             }
         }
-        static mp(a, b) {
+        static mn(a, b) {
             b = 7;
             let c = a.ao("val");
             if (c != null) {
@@ -5353,13 +5280,13 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p1: b
             };
         }
-        static pr(a, b) {
-            a.ad.q(DrawingMLMain.ho, "a");
+        static po(a, b) {
+            a.ad.p(DrawingMLMain.ho, "a");
             let c;
             c = XmlNamespaceDefinitionBase.p(ST_PresetColorVal_$type, b);
-            a.ad.i("val", c);
+            a.ad.h("val", c);
         }
-        static mq(a, b) {
+        static mo(a, b) {
             let c = a.ao("prst");
             b = 0;
             if (c != null) {
@@ -5369,48 +5296,48 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p1: b
             };
         }
-        static ps(a, b) {
-            a.ad.q(DrawingMLMain.hq, "a");
+        static pp(a, b) {
+            a.ad.p(DrawingMLMain.hq, "a");
             let c;
             c = XmlNamespaceDefinitionBase.p(ST_ShapeType_$type, b);
-            a.ad.i("prst", c);
+            a.ad.h("prst", c);
         }
-        static mr(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.hy, b);
+        static mp(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.hy, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static pt(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.hy, b);
+        static pq(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.hy, b);
         }
-        static ms(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.hz, b);
+        static mq(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.hz, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static pu(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.hz, b);
+        static pr(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.hz, b);
         }
-        static mt(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.h0, b);
+        static mr(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.h0, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static pv(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.h0, b);
+        static ps(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.h0, b);
         }
-        static mu(a) {
+        static ms(a) {
         }
-        static pw(a) {
-            a.ad.q(DrawingMLMain.hv, "a");
+        static pt(a) {
+            a.ad.p(DrawingMLMain.hv, "a");
         }
-        static mv(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u = DrawingMLMain.h8, v = true) {
+        static mt(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u = DrawingMLMain.h8, v = true) {
             b = toNullable(Boolean_$type, null);
             c = null;
             d = null;
@@ -5532,111 +5459,111 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p19: t
             };
         }
-        static px(a, b = toNullable(Boolean_$type, null), c = null, d = null, e = toNullable(ST_TextFontSize.$, null), f = toNullable(Boolean_$type, null), g = toNullable(Boolean_$type, null), h = toNullable(ST_TextUnderlineType_$type, null), i = toNullable(ST_TextStrikeType_$type, null), j = toNullable(Number_$type, null), k = toNullable(ST_TextCapsType_$type, null), l = toNullable(ST_TextPoint.$, null), m = toNullable(Boolean_$type, null), n = toNullable(ST_Percentage.$, null), o = toNullable(Boolean_$type, null), p = toNullable(Boolean_$type, true), q = toNullable(Boolean_$type, false), r = toNullable(Boolean_$type, true), s = toNullable(Number_$type, 0), t = null) {
-            a.ad.q(DrawingMLMain.h8, "a");
+        static pu(a, b = toNullable(Boolean_$type, null), c = null, d = null, e = toNullable(ST_TextFontSize.$, null), f = toNullable(Boolean_$type, null), g = toNullable(Boolean_$type, null), h = toNullable(ST_TextUnderlineType_$type, null), i = toNullable(ST_TextStrikeType_$type, null), j = toNullable(Number_$type, null), k = toNullable(ST_TextCapsType_$type, null), l = toNullable(ST_TextPoint.$, null), m = toNullable(Boolean_$type, null), n = toNullable(ST_Percentage.$, null), o = toNullable(Boolean_$type, null), p = toNullable(Boolean_$type, true), q = toNullable(Boolean_$type, false), r = toNullable(Boolean_$type, true), s = toNullable(Number_$type, 0), t = null) {
+            a.ad.p(DrawingMLMain.h8, "a");
             let 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);
         }
-        static mw(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.ib, b);
+        static mu(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.ib, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static py(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.ib, b);
+        static pv(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.ib, b);
         }
-        static mx(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.ic, b);
+        static mv(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.ic, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static pz(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.ic, b);
+        static pw(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.ic, b);
         }
-        static my(a, b) {
-            let c = DrawingMLMain.k2(a, DrawingMLMain.id, b);
+        static mw(a, b) {
+            let c = DrawingMLMain.k1(a, DrawingMLMain.id, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static p0(a, b) {
-            DrawingMLMain.n4(a, DrawingMLMain.id, b);
+        static px(a, b) {
+            DrawingMLMain.n2(a, DrawingMLMain.id, b);
         }
-        static mz(a, b) {
+        static mx(a, b) {
             let c = a.ao("val");
             if (c == null) {
                 b = 0;
@@ -5648,28 +5575,28 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p1: b
             };
         }
-        static p1(a, b) {
-            a.ad.q(DrawingMLMain.ig, "a");
+        static py(a, b) {
+            a.ad.p(DrawingMLMain.ig, "a");
             let c;
             c = XmlNamespaceDefinitionBase.p(ST_SchemeColorVal_$type, b);
-            a.ad.i("val", c);
+            a.ad.h("val", c);
         }
-        static m0(a, b) {
-            let c = DrawingMLMain.k5(a, DrawingMLMain.ij, b);
+        static my(a, b) {
+            let c = DrawingMLMain.k4(a, DrawingMLMain.ij, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static p2(a, b) {
-            DrawingMLMain.n7(a, DrawingMLMain.ij, b);
+        static pz(a, b) {
+            DrawingMLMain.n5(a, DrawingMLMain.ij, b);
         }
-        static m1(a) {
+        static mz(a) {
         }
-        static p3(a) {
-            a.ad.q(DrawingMLMain.ip, "a");
+        static p0(a) {
+            a.ad.p(DrawingMLMain.ip, "a");
         }
-        static m2(a, b, c, d, e, f, g, h, i, j, k, l) {
+        static m0(a, b, c, d, e, f, g, h, i, j, k, l) {
             b = false;
             c = false;
             d = false;
@@ -5733,56 +5660,56 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p11: l
             };
         }
-        static p4(a, b = false, c = false, d = false, e = false, f = false, g = false, h = false, i = false, j = false, k = false, l = false) {
-            a.ad.q(DrawingMLMain.iz, "a");
+        static p1(a, b = false, c = false, d = false, e = false, f = false, g = false, h = false, i = false, j = false, k = false, l = false) {
+            a.ad.p(DrawingMLMain.iz, "a");
             let 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);
             }
         }
-        static m3(a, b, c, d, e) {
-            let f = DrawingMLMain.k8(a, DrawingMLMain.i0, b, c, d, e);
+        static m1(a, b, c, d, e) {
+            let f = DrawingMLMain.k7(a, DrawingMLMain.i0, b, c, d, e);
             b = f.p2;
             c = f.p3;
             d = f.p4;
@@ -5794,10 +5721,10 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        static p5(a, b, c, d, e) {
-            DrawingMLMain.oa(a, DrawingMLMain.i0, b, c, d, e);
+        static p2(a, b, c, d, e) {
+            DrawingMLMain.n8(a, DrawingMLMain.i0, b, c, d, e);
         }
-        static m4(a, b) {
+        static m2(a, b) {
             let c = a.ao("val");
             if (c == null) {
                 b = ST_HexColorRGB.a;
@@ -5809,18 +5736,18 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p1: b
             };
         }
-        static p6(a, b) {
-            a.ad.q(DrawingMLMain.i1, "a");
+        static p3(a, b) {
+            a.ad.p(DrawingMLMain.i1, "a");
             let c;
             c = b.toString();
-            a.ad.i("val", c);
+            a.ad.h("val", c);
         }
-        static m5(a) {
+        static m3(a) {
         }
-        static p7(a) {
-            a.ad.q(DrawingMLMain.i3, "a");
+        static p4(a) {
+            a.ad.p(DrawingMLMain.i3, "a");
         }
-        static m6(a, b, c) {
+        static m4(a, b, c) {
             b = 0;
             c = ST_HexColorRGB.a;
             for (let d of fromEnum(a.ab.u)) {
@@ -5839,16 +5766,16 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static p8(a, b, c) {
-            a.ad.q(DrawingMLMain.i9, "a");
+        static p5(a, b, c) {
+            a.ad.p(DrawingMLMain.i9, "a");
             let 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);
         }
-        static m7(a, b, c, d) {
-            let e = DrawingMLMain.k0(a, DrawingMLMain.jf, b, c, d);
+        static m5(a, b, c, d) {
+            let e = DrawingMLMain.kz(a, DrawingMLMain.jf, b, c, d);
             b = e.p2;
             c = e.p3;
             d = e.p4;
@@ -5858,52 +5785,52 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p3: d
             };
         }
-        static p9(a, b, c, d) {
-            DrawingMLMain.n2(a, DrawingMLMain.jf, b, c, d);
+        static p6(a, b, c, d) {
+            DrawingMLMain.n0(a, DrawingMLMain.jf, b, c, d);
         }
-        static m8(a, b) {
+        static m6(a, b) {
             b = XmlNamespaceDefinitionBase.u(a, DrawingMLMain.jb, 6);
             return {
                 p1: b
             };
         }
-        static qa(a, b) {
+        static p7(a, b) {
             XmlNamespaceDefinitionBase.aj(a, DrawingMLMain.jb, "a", b, void 0, 6);
         }
-        static m9(a, b) {
+        static m7(a, b) {
             b = a.ao("name");
             return {
                 p1: b
             };
         }
-        static qb(a, b) {
-            a.ad.q(DrawingMLMain.jh, "a");
+        static p8(a, b) {
+            a.ad.p(DrawingMLMain.jh, "a");
             let 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);
         }
-        static na(a) {
+        static m8(a) {
         }
-        static qc(a) {
-            a.ad.q(DrawingMLMain.ji, "a");
+        static p9(a) {
+            a.ad.p(DrawingMLMain.ji, "a");
         }
-        static nb(a) {
+        static m9(a) {
         }
-        static qd(a) {
-            a.ad.q(DrawingMLMain.jj, "a");
+        static qa(a) {
+            a.ad.p(DrawingMLMain.jj, "a");
         }
-        static nc(a, b) {
-            let c = DrawingMLMain.k5(a, DrawingMLMain.jn, b);
+        static na(a, b) {
+            let c = DrawingMLMain.k4(a, DrawingMLMain.jn, b);
             b = c.p2;
             return {
                 p1: b
             };
         }
-        static qe(a, b) {
-            DrawingMLMain.n7(a, DrawingMLMain.jn, b);
+        static qb(a, b) {
+            DrawingMLMain.n5(a, DrawingMLMain.jn, b);
         }
-        static nd(a, b, c, d) {
+        static nb(a, b, c, d) {
             b = ST_Angle.a(0);
             c = false;
             d = false;
@@ -5927,20 +5854,20 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
                 p3: d
             };
         }
-        static qf(a, b = new ST_Angle(), c = false, d = false) {
-            a.ad.q(DrawingMLMain.ka, "a");
+        static qc(a, b = new ST_Angle(), c = false, d = false) {
+            a.ad.p(DrawingMLMain.j9, "a");
             let 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);
             }
         }
     }
@@ -6052,7 +5979,7 @@ let DrawingMLMain = /*@__PURE__*/ (() => {
     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";
@@ -6266,22 +6193,22 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         c3(a, b, c = 0, d = 0) {
-            a.ad.q(b, this.t);
+            a.ad.p(b, this.t);
             let 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);
             }
         }
         static db(a, b) {
             if (stringIsNullOrEmpty(b)) {
                 return;
             }
-            a.ad.i("macro", b);
+            a.ad.h("macro", b);
         }
         b5(a, b, c) {
             b = toNullable(Number_$type, null);
@@ -6303,31 +6230,31 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         cw(a, b, c) {
-            a.ad.q(this.ao, this.t);
+            a.ad.p(this.ao, this.t);
             let 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);
             }
         }
         b6(a) {
         }
         cx(a) {
-            a.ad.q(this.aq, this.t);
+            a.ad.p(this.aq, this.t);
         }
         b7(a) {
         }
         cy(a) {
-            a.ad.q(this.ar, this.t);
+            a.ad.p(this.ar, this.t);
         }
         b8(a) {
         }
         cz(a) {
-            a.ad.q(this.as, this.t);
+            a.ad.p(this.as, this.t);
         }
         b9(a, b) {
             let c = a.ao("preferRelativeResize");
@@ -6342,15 +6269,15 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         c0(a, b = true) {
-            a.ad.q(this.at, this.t);
+            a.ad.p(this.at, this.t);
             let c;
             if (b != true) {
                 c = ST_OnOff.g(b);
-                a.ad.i("preferRelativeResize", c);
+                a.ad.h("preferRelativeResize", c);
             }
         }
         ca(a, b, c, d, e, f) {
-            let g = DrawingMLMain.k1(a, this.au, b, c, d, e, f);
+            let g = DrawingMLMain.k0(a, this.au, b, c, d, e, f);
             b = g.p2;
             c = g.p3;
             d = g.p4;
@@ -6365,7 +6292,7 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         c1(a, b, c, d = null, e = false, f = null) {
-            DrawingMLMain.n3(a, this.au, b, c, d, e, f);
+            DrawingMLMain.n1(a, this.au, b, c, d, e, f);
         }
         cb(a, b) {
             let c = a.ao("txBox");
@@ -6380,11 +6307,11 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         c2(a, b = false) {
-            a.ad.q(this.av, this.t);
+            a.ad.p(this.av, this.t);
             let c;
             if (b != false) {
                 c = ST_OnOff.g(b);
-                a.ad.i("txBox", c);
+                a.ad.h("txBox", c);
             }
         }
         cd(a, b, c) {
@@ -6407,13 +6334,13 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         c4(a, b = null, c = false) {
-            a.ad.q(this.aw, this.t);
+            a.ad.p(this.aw, this.t);
             let 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);
             }
         }
         ce(a, b, c, d, e, f, g, h, i, j, k) {
@@ -6476,47 +6403,47 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         c5(a, b = false, c = false, d = false, e = false, f = false, g = false, h = false, i = false, j = false, k = false) {
-            a.ad.q(this.ax, this.t);
+            a.ad.p(this.ax, this.t);
             let 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);
             }
         }
         cf(a, b, c) {
@@ -6551,19 +6478,19 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         c7(a, b = null, c = false) {
-            a.ad.q(this.a4, this.t);
+            a.ad.p(this.a4, this.t);
             let 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);
             }
         }
         ch(a) {
         }
         c8(a) {
-            a.ad.q(this.a5, this.t);
+            a.ad.p(this.a5, this.t);
         }
         ci(a, b, c, d, e, f, g, h) {
             b = false;
@@ -6610,35 +6537,35 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         c9(a, b = false, c = false, d = false, e = false, f = false, g = false, h = false) {
-            a.ad.q(this.a6, this.t);
+            a.ad.p(this.a6, this.t);
             let 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);
             }
         }
         cj(a, b) {
@@ -6654,37 +6581,37 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         da(a, b = toNullable(ST_BlackWhiteMode_$type, null)) {
-            a.ad.q(this.a7, this.t);
+            a.ad.p(this.a7, this.t);
             let c;
             if (nullableNotEquals(b, null)) {
                 c = XmlNamespaceDefinitionBase.p(ST_BlackWhiteMode_$type, b.value);
-                a.ad.i("bwMode", c);
+                a.ad.h("bwMode", c);
             }
         }
         ck(a) {
         }
         dc(a) {
-            a.ad.q(this.bo, this.t);
+            a.ad.p(this.bo, this.t);
         }
         cl(a) {
         }
         dd(a) {
-            a.ad.q(this.bp, this.t);
+            a.ad.p(this.bp, this.t);
         }
         cm(a) {
         }
         de(a) {
-            a.ad.q(this.bq, this.t);
+            a.ad.p(this.bq, this.t);
         }
         cn(a) {
         }
         df(a) {
-            a.ad.q(this.br, this.t);
+            a.ad.p(this.br, this.t);
         }
         co(a) {
         }
         dg(a) {
-            a.ad.q(this.bs, this.t);
+            a.ad.p(this.bs, this.t);
         }
         cp(a, b, c) {
             b = "";
@@ -6706,13 +6633,13 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         dh(a, b = "", c = false) {
-            a.ad.q(this.bt, this.t);
+            a.ad.p(this.bt, this.t);
             let 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);
             }
         }
         cq(a, b, c, d, e) {
@@ -6745,19 +6672,19 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         di(a, b = null, c = null, d = true, e = false) {
-            a.ad.q(this.bx, this.t);
+            a.ad.p(this.bx, this.t);
             let 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);
             }
         }
         cr(a, b) {
@@ -6773,11 +6700,11 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         dj(a, b = toNullable(ST_BlackWhiteMode_$type, null)) {
-            a.ad.q(this.by, this.t);
+            a.ad.p(this.by, this.t);
             let c;
             if (nullableNotEquals(b, null)) {
                 c = XmlNamespaceDefinitionBase.p(ST_BlackWhiteMode_$type, b.value);
-                a.ad.i("bwMode", c);
+                a.ad.h("bwMode", c);
             }
         }
         cs(a, b, c) {
@@ -6795,12 +6722,12 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
         ct(a) {
         }
         dl(a) {
-            a.ad.q(this.b0, this.t);
+            a.ad.p(this.b0, this.t);
         }
         cu(a) {
         }
         dm(a) {
-            a.ad.q(this.b2, this.t);
+            a.ad.p(this.b2, this.t);
         }
         cv(a, b, c, d) {
             b = ST_Angle.a(0);
@@ -6827,19 +6754,19 @@ let DrawingNamespaceDefinitionBase = /*@__PURE__*/ (() => {
             };
         }
         dn(a, b = new ST_Angle(), c = false, d = false) {
-            a.ad.q(this.b4, this.t);
+            a.ad.p(this.b4, this.t);
             let 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);
             }
         }
     }
@@ -6864,10 +6791,10 @@ let EmptyNamespace = /*@__PURE__*/ (() => {
         static aq(a) {
         }
         static ar(a, b = toNullable(Number_$type, null), c = toNullable(Number_$type, null)) {
-            a.ad.p("xml");
+            a.ad.o("xml");
             let 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 = /*@__PURE__*/ markType(EmptyNamespace, 'EmptyNamespace', XmlNamespaceDefinitionBase.$);
@@ -6917,7 +6844,7 @@ let MarkupCompatibility2006 = /*@__PURE__*/ (() => {
         static aw(a) {
         }
         static az(a) {
-            a.ad.q(MarkupCompatibility2006.aq, "mc");
+            a.ad.p(MarkupCompatibility2006.aq, "mc");
         }
         static ax(a, b) {
             b = a.ao("Requires");
@@ -6929,15 +6856,15 @@ let MarkupCompatibility2006 = /*@__PURE__*/ (() => {
             MarkupCompatibility2006.a1(a, stringJoin1(String_$type, " ", Enumerable.o(XmlNamespaceDefinitionBase.$, String_$type, b, (c) => c.t)));
         }
         static a1(a, b) {
-            a.ad.q(MarkupCompatibility2006.ar, "mc");
+            a.ad.p(MarkupCompatibility2006.ar, "mc");
             let c;
             c = b;
-            a.ad.i("Requires", c);
+            a.ad.h("Requires", c);
         }
         static ay(a) {
         }
         static a2(a) {
-            a.ad.q(MarkupCompatibility2006.as, "mc");
+            a.ad.p(MarkupCompatibility2006.as, "mc");
         }
     }
     MarkupCompatibility2006.$t = /*@__PURE__*/ markType(MarkupCompatibility2006, 'MarkupCompatibility2006', XmlNamespaceDefinitionBase.$);
@@ -7115,7 +7042,7 @@ let OfficeDocumentDocPropsVTypes = /*@__PURE__*/ (() => {
         static ca(a) {
         }
         static cw(a) {
-            a.ad.q(OfficeDocumentDocPropsVTypes.ba, "vt");
+            a.ad.p(OfficeDocumentDocPropsVTypes.ba, "vt");
         }
         static cb(a, b, c) {
             b = 0;
@@ -7137,12 +7064,12 @@ let OfficeDocumentDocPropsVTypes = /*@__PURE__*/ (() => {
             };
         }
         static cx(a, b, c) {
-            a.ad.q(OfficeDocumentDocPropsVTypes.bb, "vt");
+            a.ad.p(OfficeDocumentDocPropsVTypes.bb, "vt");
             let 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);
         }
         static bc(a) {
             let b = a.s.a(IVariantValueContainer_$type);
@@ -7382,12 +7309,12 @@ let OfficeDocumentDocPropsVTypes = /*@__PURE__*/ (() => {
             else {
                 return;
             }
-            a.ad.l();
+            a.ad.k();
         }
         static ce(a, b) {
             OfficeDocumentDocPropsVTypes.cw(a);
             OfficeDocumentDocPropsVTypes.cd(a, b);
-            a.ad.l();
+            a.ad.k();
         }
         static cf(a, b) {
             OfficeDocumentDocPropsVTypes.cx(a, b.b, intSToU(b.a.length));
@@ -7397,7 +7324,7 @@ let OfficeDocumentDocPropsVTypes = /*@__PURE__*/ (() => {
             else {
                 DocCoreUtils.ao(Base.$, b.a, (c) => OfficeDocumentDocPropsVTypes.cd(a, c));
             }
-            a.ad.l();
+            a.ad.k();
         }
     }
     OfficeDocumentDocPropsVTypes.$t = /*@__PURE__*/ markType(OfficeDocumentDocPropsVTypes, 'OfficeDocumentDocPropsVTypes', XmlNamespaceDefinitionBase.$);
@@ -7500,7 +7427,7 @@ let OfficeDocumentExtendedProperties = /*@__PURE__*/ (() => {
         static bo(a) {
         }
         static cf(a) {
-            a.ad.q(OfficeDocumentExtendedProperties.aw, null);
+            a.ad.p(OfficeDocumentExtendedProperties.aw, null);
         }
         static bp(a, b) {
             b = XmlNamespaceDefinitionBase.l(a, OfficeDocumentExtendedProperties.ax);
@@ -7604,10 +7531,10 @@ let OfficeDocumentExtendedProperties = /*@__PURE__*/ (() => {
         static b0(a) {
         }
         static cr(a) {
-            a.ad.q(OfficeDocumentExtendedProperties.ba, null);
+            a.ad.p(OfficeDocumentExtendedProperties.ba, null);
             let b = a.d._ab;
-            a.ad.m(OfficeDocumentExtendedProperties.ao);
-            a.ad.m(OfficeDocumentDocPropsVTypes.ao);
+            a.ad.l(OfficeDocumentExtendedProperties.ao);
+            a.ad.l(OfficeDocumentDocPropsVTypes.ao);
         }
         static b1(a, b) {
             b = XmlNamespaceDefinitionBase.e(a, OfficeDocumentExtendedProperties.bb);
@@ -7648,7 +7575,7 @@ let OfficeDocumentExtendedProperties = /*@__PURE__*/ (() => {
         static b5(a) {
         }
         static cv(a) {
-            a.ad.q(OfficeDocumentExtendedProperties.bf, null);
+            a.ad.p(OfficeDocumentExtendedProperties.bf, null);
         }
         static b6(a, b) {
             b = XmlNamespaceDefinitionBase.l(a, OfficeDocumentExtendedProperties.bg);
@@ -7771,14 +7698,14 @@ let OfficeNamespace = /*@__PURE__*/ (() => {
             };
         }
         static cl(a, b = toNullable(ST_Ext_$type, null), c = null) {
-            a.ad.q(OfficeNamespace.bs, "o");
+            a.ad.p(OfficeNamespace.bs, "o");
             let 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);
         }
         static cj(a, b, c, d, e, f, g, h, i, j, k, l, m) {
             b = toNullable(ST_Ext_$type, null);
@@ -7850,55 +7777,55 @@ let OfficeNamespace = /*@__PURE__*/ (() => {
             };
         }
         static cm(a, b = toNullable(ST_Ext_$type, null), c = toNullable(Boolean_$type, null), d = toNullable(Boolean_$type, null), e = toNullable(Boolean_$type, null), f = toNullable(Boolean_$type, null), g = toNullable(Boolean_$type, null), h = toNullable(Boolean_$type, null), i = toNullable(Boolean_$type, null), j = toNullable(Boolean_$type, null), k = toNullable(Boolean_$type, null), l = toNullable(Boolean_$type, null), m = toNullable(Boolean_$type, null)) {
-            a.ad.q(OfficeNamespace.ap, "o");
+            a.ad.p(OfficeNamespace.ap, "o");
             let 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);
             }
         }
         static ck(a, b) {
@@ -7914,11 +7841,11 @@ let OfficeNamespace = /*@__PURE__*/ (() => {
             };
         }
         static cn(a, b = toNullable(ST_Ext_$type, null)) {
-            a.ad.q(OfficeNamespace.b7, "o");
+            a.ad.p(OfficeNamespace.b7, "o");
             let 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);
             }
         }
     }
@@ -7996,7 +7923,7 @@ let VmlNamespace = /*@__PURE__*/ (() => {
         get t() {
             return this.get_t();
         }
-        static ds(a, b, c) {
+        static dp(a, b, c) {
             b = toNullable(Number_$type, null);
             c = toNullable(Number_$type, null);
             for (let d of fromEnum(a.ab.u)) {
@@ -8015,42 +7942,19 @@ let VmlNamespace = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static d3(a, b = toNullable(Number_$type, null), c = toNullable(Number_$type, null)) {
-            a.ad.q("urn:schemas-microsoft-com:vml/arc", "v");
+        static dy(a, b = toNullable(Number_$type, null), c = toNullable(Number_$type, null)) {
+            a.ad.p("urn:schemas-microsoft-com:vml/arc", "v");
             let 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);
             }
         }
-        static dt(a, b) {
-            b = null;
-            for (let c of fromEnum(a.ab.u)) {
-                switch (c.a.e(a.d)) {
-                    case "eqn":
-                        b = c.d;
-                        break;
-                    default: break;
-                }
-            }
-            return {
-                p1: b
-            };
-        }
-        static d4(a, b) {
-            a.ad.q("urn:schemas-microsoft-com:vml/f", "v");
-            a.ad.i("eqn", b);
-        }
-        static dv(a) {
-        }
-        static d6(a) {
-            a.ad.q("urn:schemas-microsoft-com:vml/formulas", "v");
-        }
-        static du(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) {
+        static dq(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) {
             b = null;
             c = toNullable(ST_FillType_$type, null);
             d = toNullable(Boolean_$type, null);
@@ -8194,83 +8098,83 @@ let VmlNamespace = /*@__PURE__*/ (() => {
                 p27: ab
             };
         }
-        static d5(a, b = null, c = toNullable(ST_FillType_$type, null), d = toNullable(Boolean_$type, null), e = null, f = null, g = null, h = null, i = null, j = null, k = null, l = null, m = null, n = toNullable(ST_ImageAspect_$type, null), o = null, p = toNullable(Number_$type, null), q = toNullable(Boolean_$type, null), r = null, s = null, t = null, u = toNullable(ST_FillMethod_$type, null), v = toNullable(Boolean_$type, null), w = null, x = null, y = toNullable(Boolean_$type, null), z = toNullable(Boolean_$type, null), aa = null, ab = null) {
-            a.ad.q("urn:schemas-microsoft-com:vml/fill", "v");
+        static dz(a, b = null, c = toNullable(ST_FillType_$type, null), d = toNullable(Boolean_$type, null), e = null, f = null, g = null, h = null, i = null, j = null, k = null, l = null, m = null, n = toNullable(ST_ImageAspect_$type, null), o = null, p = toNullable(Number_$type, null), q = toNullable(Boolean_$type, null), r = null, s = null, t = null, u = toNullable(ST_FillMethod_$type, null), v = toNullable(Boolean_$type, null), w = null, x = null, y = toNullable(Boolean_$type, null), z = toNullable(Boolean_$type, null), aa = null, ab = null) {
+            a.ad.p("urn:schemas-microsoft-com:vml/fill", "v");
             let 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);
         }
-        static dw(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) {
+        static dr(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) {
             b = null;
             c = null;
             d = null;
@@ -8399,69 +8303,69 @@ let VmlNamespace = /*@__PURE__*/ (() => {
                 p24: y
             };
         }
-        static d7(a, b = null, c = null, d = null, e = null, f = null, g = null, h = null, i = null, j = null, k = toNullable(Boolean_$type, null), l = toNullable(Boolean_$type, null), m = null, n = null, o = null, p = null, q = null, r = null, s = toNullable(Number_$type, null), t = toNullable(Boolean_$type, null), u = toNullable(Number_$type, null), v = null, w = null, x = null, y = null) {
-            a.ad.q("urn:schemas-microsoft-com:vml/imagedata", "v");
+        static d0(a, b = null, c = null, d = null, e = null, f = null, g = null, h = null, i = null, j = null, k = toNullable(Boolean_$type, null), l = toNullable(Boolean_$type, null), m = null, n = null, o = null, p = null, q = null, r = null, s = toNullable(Number_$type, null), t = toNullable(Boolean_$type, null), u = toNullable(Number_$type, null), v = null, w = null, x = null, y = null) {
+            a.ad.p("urn:schemas-microsoft-com:vml/imagedata", "v");
             let 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);
         }
-        static dx(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) {
+        static ds(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) {
             b = null;
             c = null;
             d = null;
@@ -8545,59 +8449,59 @@ let VmlNamespace = /*@__PURE__*/ (() => {
                 p15: p
             };
         }
-        static d8(a, b = null, c = null, d = null, e = null, f = toNullable(Boolean_$type, null), g = toNullable(Boolean_$type, null), h = toNullable(Boolean_$type, null), i = toNullable(Boolean_$type, null), j = toNullable(Boolean_$type, null), k = toNullable(Boolean_$type, null), l = toNullable(Boolean_$type, null), m = toNullable(ST_ConnectType_$type, null), n = null, o = null, p = toNullable(Boolean_$type, null)) {
-            a.ad.q("urn:schemas-microsoft-com:vml/path", "v");
+        static d1(a, b = null, c = null, d = null, e = null, f = toNullable(Boolean_$type, null), g = toNullable(Boolean_$type, null), h = toNullable(Boolean_$type, null), i = toNullable(Boolean_$type, null), j = toNullable(Boolean_$type, null), k = toNullable(Boolean_$type, null), l = toNullable(Boolean_$type, null), m = toNullable(ST_ConnectType_$type, null), n = null, o = null, p = toNullable(Boolean_$type, null)) {
+            a.ad.p("urn:schemas-microsoft-com:vml/path", "v");
             let 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);
             }
         }
-        static dy(a, b, c, d, e, f, g, h, i, j, k, l) {
+        static dt(a, b, c, d, e, f, g, h, i, j, k, l) {
             b = null;
             c = toNullable(Boolean_$type, null);
             d = toNullable(ST_ShadowType_$type, null);
@@ -8661,39 +8565,39 @@ let VmlNamespace = /*@__PURE__*/ (() => {
                 p11: l
             };
         }
-        static d9(a, b = null, c = toNullable(Boolean_$type, null), d = toNullable(ST_ShadowType_$type, null), e = toNullable(Boolean_$type, null), f = null, g = null, h = null, i = null, j = null, k = null, l = null) {
-            a.ad.q("urn:schemas-microsoft-com:vml/shadow", "v");
+        static d2(a, b = null, c = toNullable(Boolean_$type, null), d = toNullable(ST_ShadowType_$type, null), e = toNullable(Boolean_$type, null), f = null, g = null, h = null, i = null, j = null, k = null, l = null) {
+            a.ad.p("urn:schemas-microsoft-com:vml/shadow", "v");
             let 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);
         }
-        static dz(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) {
+        static du(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) {
             b = null;
             c = null;
             d = null;
@@ -8992,185 +8896,185 @@ let VmlNamespace = /*@__PURE__*/ (() => {
                 p58: a6
             };
         }
-        static ea(a, b = null, c = null, d = null, e = null, f = null, g = null, h = null, i = null, j = null, k = null, l = toNullable(Boolean_$type, null), m = null, n = toNullable(Boolean_$type, null), o = null, p = toNullable(Boolean_$type, null), q = toNullable(Boolean_$type, null), r = toNullable(Boolean_$type, null), s = toNullable(Boolean_$type, null), t = toNullable(Boolean_$type, null), u = toNullable(Boolean_$type, null), v = toNullable(Boolean_$type, null), w = toNullable(Number_$type, null), x = toNullable(ST_HrAlign_$type, null), y = toNullable(Boolean_$type, null), z = toNullable(Boolean_$type, null), aa = toNullable(Boolean_$type, null), ab = null, ac = null, ad = null, ae = null, af = null, ag = null, ah = null, ai = toNullable(ST_InsetMode_$type, null), aj = null, ak = toNullable(Boolean_$type, null), al = null, am = null, an = toNullable(Boolean_$type, null), ao = null, ap = null, aq = toNullable(Boolean_$type, null), ar = toNullable(Number_$type, null), as = toNullable(ST_ConnectorType_$type, null), at = toNullable(ST_BWMode_$type, null), au = toNullable(ST_BWMode_$type, null), av = toNullable(ST_BWMode_$type, null), aw = toNullable(Boolean_$type, null), ax = toNullable(Boolean_$type, null), ay = toNullable(Boolean_$type, null), az = toNullable(Boolean_$type, null), a0 = toNullable(Boolean_$type, null), a1 = toNullable(Boolean_$type, null), a2 = null, a3 = null, a4 = null, a5 = null, a6 = null) {
-            a.ad.q("urn:schemas-microsoft-com:vml/shape", "v");
+        static d3(a, b = null, c = null, d = null, e = null, f = null, g = null, h = null, i = null, j = null, k = null, l = toNullable(Boolean_$type, null), m = null, n = toNullable(Boolean_$type, null), o = null, p = toNullable(Boolean_$type, null), q = toNullable(Boolean_$type, null), r = toNullable(Boolean_$type, null), s = toNullable(Boolean_$type, null), t = toNullable(Boolean_$type, null), u = toNullable(Boolean_$type, null), v = toNullable(Boolean_$type, null), w = toNullable(Number_$type, null), x = toNullable(ST_HrAlign_$type, null), y = toNullable(Boolean_$type, null), z = toNullable(Boolean_$type, null), aa = toNullable(Boolean_$type, null), ab = null, ac = null, ad = null, ae = null, af = null, ag = null, ah = null, ai = toNullable(ST_InsetMode_$type, null), aj = null, ak = toNullable(Boolean_$type, null), al = null, am = null, an = toNullable(Boolean_$type, null), ao = null, ap = null, aq = toNullable(Boolean_$type, null), ar = toNullable(Number_$type, null), as = toNullable(ST_ConnectorType_$type, null), at = toNullable(ST_BWMode_$type, null), au = toNullable(ST_BWMode_$type, null), av = toNullable(ST_BWMode_$type, null), aw = toNullable(Boolean_$type, null), ax = toNullable(Boolean_$type, null), ay = toNullable(Boolean_$type, null), az = toNullable(Boolean_$type, null), a0 = toNullable(Boolean_$type, null), a1 = toNullable(Boolean_$type, null), a2 = null, a3 = null, a4 = null, a5 = null, a6 = null) {
+            a.ad.p("urn:schemas-microsoft-com:vml/shape", "v");
             let 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);
         }
-        static d0(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) {
+        static dv(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) {
             b = null;
             c = null;
             d = null;
@@ -9459,181 +9363,181 @@ let VmlNamespace = /*@__PURE__*/ (() => {
                 p56: a4
             };
         }
-        static eb(a, b = null, c = null, d = null, e = null, f = null, g = null, h = null, i = null, j = null, k = null, l = toNullable(Boolean_$type, null), m = null, n = toNullable(Boolean_$type, null), o = null, p = toNullable(Boolean_$type, null), q = toNullable(Boolean_$type, null), r = toNullable(Boolean_$type, null), s = toNullable(Boolean_$type, null), t = toNullable(Boolean_$type, null), u = toNullable(Boolean_$type, null), v = toNullable(Boolean_$type, null), w = toNullable(Number_$type, null), x = toNullable(ST_HrAlign_$type, null), y = toNullable(Boolean_$type, null), z = toNullable(Boolean_$type, null), aa = toNullable(Boolean_$type, null), ab = null, ac = null, ad = null, ae = null, af = null, ag = null, ah = null, ai = toNullable(ST_InsetMode_$type, null), aj = null, ak = toNullable(Boolean_$type, null), al = null, am = null, an = toNullable(Boolean_$type, null), ao = null, ap = null, aq = toNullable(Boolean_$type, null), ar = toNullable(Number_$type, null), as = toNullable(ST_ConnectorType_$type, null), at = toNullable(ST_BWMode_$type, null), au = toNullable(ST_BWMode_$type, null), av = toNullable(ST_BWMode_$type, null), aw = toNullable(Boolean_$type, null), ax = toNullable(Boolean_$type, null), ay = toNullable(Boolean_$type, null), az = toNullable(Boolean_$type, null), a0 = toNullable(Boolean_$type, null), a1 = toNullable(Boolean_$type, null), a2 = null, a3 = null, a4 = null) {
-            a.ad.q("urn:schemas-microsoft-com:vml/shapetype", "v");
+        static d4(a, b = null, c = null, d = null, e = null, f = null, g = null, h = null, i = null, j = null, k = null, l = toNullable(Boolean_$type, null), m = null, n = toNullable(Boolean_$type, null), o = null, p = toNullable(Boolean_$type, null), q = toNullable(Boolean_$type, null), r = toNullable(Boolean_$type, null), s = toNullable(Boolean_$type, null), t = toNullable(Boolean_$type, null), u = toNullable(Boolean_$type, null), v = toNullable(Boolean_$type, null), w = toNullable(Number_$type, null), x = toNullable(ST_HrAlign_$type, null), y = toNullable(Boolean_$type, null), z = toNullable(Boolean_$type, null), aa = toNullable(Boolean_$type, null), ab = null, ac = null, ad = null, ae = null, af = null, ag = null, ah = null, ai = toNullable(ST_InsetMode_$type, null), aj = null, ak = toNullable(Boolean_$type, null), al = null, am = null, an = toNullable(Boolean_$type, null), ao = null, ap = null, aq = toNullable(Boolean_$type, null), ar = toNullable(Number_$type, null), as = toNullable(ST_ConnectorType_$type, null), at = toNullable(ST_BWMode_$type, null), au = toNullable(ST_BWMode_$type, null), av = toNullable(ST_BWMode_$type, null), aw = toNullable(Boolean_$type, null), ax = toNullable(Boolean_$type, null), ay = toNullable(Boolean_$type, null), az = toNullable(Boolean_$type, null), a0 = toNullable(Boolean_$type, null), a1 = toNullable(Boolean_$type, null), a2 = null, a3 = null, a4 = null) {
+            a.ad.p("urn:schemas-microsoft-com:vml/shapetype", "v");
             let 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);
         }
-        static d1(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) {
+        static dw(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) {
             b = null;
             c = toNullable(Boolean_$type, null);
             d = null;
@@ -9787,101 +9691,101 @@ let VmlNamespace = /*@__PURE__*/ (() => {
                 p29: ad
             };
         }
-        static ec(a, b = null, c = toNullable(Boolean_$type, null), d = null, e = null, f = null, g = toNullable(ST_StrokeLineStyle_$type, null), h = toNullable(Number_$type, null), i = toNullable(ST_StrokeJoinStyle_$type, null), j = toNullable(ST_StrokeEndCap_$type, null), k = null, l = toNullable(ST_FillType_$type, null), m = null, n = toNullable(ST_ImageAspect_$type, null), o = null, p = toNullable(Boolean_$type, null), q = null, r = toNullable(ST_StrokeArrowType_$type, null), s = toNullable(ST_StrokeArrowWidth_$type, null), t = toNullable(ST_StrokeArrowLength_$type, null), u = toNullable(ST_StrokeArrowType_$type, null), v = toNullable(ST_StrokeArrowWidth_$type, null), w = toNullable(ST_StrokeArrowLength_$type, null), x = null, y = null, z = null, aa = toNullable(Boolean_$type, null), ab = null, ac = toNullable(Boolean_$type, null), ad = null) {
-            a.ad.q("urn:schemas-microsoft-com:vml/stroke", "v");
+        static d5(a, b = null, c = toNullable(Boolean_$type, null), d = null, e = null, f = null, g = toNullable(ST_StrokeLineStyle_$type, null), h = toNullable(Number_$type, null), i = toNullable(ST_StrokeJoinStyle_$type, null), j = toNullable(ST_StrokeEndCap_$type, null), k = null, l = toNullable(ST_FillType_$type, null), m = null, n = toNullable(ST_ImageAspect_$type, null), o = null, p = toNullable(Boolean_$type, null), q = null, r = toNullable(ST_StrokeArrowType_$type, null), s = toNullable(ST_StrokeArrowWidth_$type, null), t = toNullable(ST_StrokeArrowLength_$type, null), u = toNullable(ST_StrokeArrowType_$type, null), v = toNullable(ST_StrokeArrowWidth_$type, null), w = toNullable(ST_StrokeArrowLength_$type, null), x = null, y = null, z = null, aa = toNullable(Boolean_$type, null), ab = null, ac = toNullable(Boolean_$type, null), ad = null) {
+            a.ad.p("urn:schemas-microsoft-com:vml/stroke", "v");
             let 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);
         }
-        static d2(a, b, c, d, e, f) {
+        static dx(a, b, c, d, e, f) {
             b = null;
             c = null;
             d = null;
@@ -9915,22 +9819,22 @@ let VmlNamespace = /*@__PURE__*/ (() => {
                 p5: f
             };
         }
-        static ed(a, b = null, c = null, d = null, e = toNullable(Boolean_$type, null), f = toNullable(ST_InsetMode_$type, null)) {
-            a.ad.q("urn:schemas-microsoft-com:vml/textbox", "v");
+        static d6(a, b = null, c = null, d = null, e = toNullable(Boolean_$type, null), f = toNullable(ST_InsetMode_$type, null)) {
+            a.ad.p("urn:schemas-microsoft-com:vml/textbox", "v");
             let 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);
             }
         }
     }
@@ -9959,7 +9863,7 @@ let XmlNamespace = /*@__PURE__*/ (() => {
             return this.get_t();
         }
         static at(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 = /*@__PURE__*/ markType(XmlNamespace, 'XmlNamespace', XmlNamespaceDefinitionBase.$);