smartyellow/docx-js
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conformance issues with imagerun - out of order properties (a:xfrm), invalid attr name (pic:cNvPr) desc -> descr

Browse Source
This commit is contained in:
Tom Hunkapiller
2021-05-20 00:36:35 +03:00
parent cdc97adaeb
commit 45130bed0b
5 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/file/drawing/drawing.spec.ts
View File

@ -111,7 +111,7 @@ describe("Drawing", () => {
{
"pic:cNvPr": {
_attr: {
desc: "",
descr: "",
id: 0,
name: "",
},
@ -166,14 +166,6 @@ describe("Drawing", () => {
{
_attr: {},
},
{
"a:ext": {
_attr: {
cx: 952500,
cy: 952500,
},
},
},
{
"a:off": {
_attr: {
@ -182,6 +174,14 @@ describe("Drawing", () => {
},
},
},
{
"a:ext": {
_attr: {
cx: 952500,
cy: 952500,
},
},
},
],
},
{
@ -341,7 +341,7 @@ describe("Drawing", () => {
{
"pic:cNvPr": {
_attr: {
desc: "",
descr: "",
id: 0,
name: "",
},
@ -396,14 +396,6 @@ describe("Drawing", () => {
{
_attr: {},
},
{
"a:ext": {
_attr: {
cx: 952500,
cy: 952500,
},
},
},
{
"a:off": {
_attr: {
@ -412,6 +404,14 @@ describe("Drawing", () => {
},
},
},
{
"a:ext": {
_attr: {
cx: 952500,
cy: 952500,
},
},
},
],
},
{

2
src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts
View File

@ -8,6 +8,6 @@ export class NonVisualPropertiesAttributes extends XmlAttributeComponent<{
protected readonly xmlKeys = {
id: "id",
name: "name",
descr: "desc",
descr: "descr",
};
}

32
src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts
View File

@ -24,14 +24,6 @@ describe("Form", () => {
{
_attr: {},
},
{
"a:ext": {
_attr: {
cx: 100,
cy: 100,
},
},
},
{
"a:off": {
_attr: {
@ -40,6 +32,14 @@ describe("Form", () => {
},
},
},
{
"a:ext": {
_attr: {
cx: 100,
cy: 100,
},
},
},
],
});
});
@ -70,14 +70,6 @@ describe("Form", () => {
flipV: true,
},
},
{
"a:ext": {
_attr: {
cx: 100,
cy: 100,
},
},
},
{
"a:off": {
_attr: {
@ -86,6 +78,14 @@ describe("Form", () => {
},
},
},
{
"a:ext": {
_attr: {
cx: 100,
cy: 100,
},
},
},
],
});
});

2
src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts
View File

@ -34,8 +34,8 @@ export class Form extends XmlComponent {
this.extents = new Extents(options.emus.x, options.emus.y);
this.root.push(this.extents);
this.root.push(new Offset());
this.root.push(this.extents);
}
public setXY(x: number, y: number): void {

72
src/file/paragraph/run/image-run.spec.ts
View File

@ -168,7 +168,7 @@ describe("ImageRun", () => {
{
"pic:cNvPr": {
_attr: {
desc: "",
descr: "",
id: 0,
name: "",
},
@ -224,14 +224,6 @@ describe("ImageRun", () => {
rot: 2700000,
},
},
{
"a:ext": {
_attr: {
cx: 1905000,
cy: 1905000,
},
},
},
{
"a:off": {
_attr: {
@ -240,6 +232,14 @@ describe("ImageRun", () => {
},
},
},
{
"a:ext": {
_attr: {
cx: 1905000,
cy: 1905000,
},
},
},
],
},
{
@ -418,7 +418,7 @@ describe("ImageRun", () => {
{
"pic:cNvPr": {
_attr: {
desc: "",
descr: "",
id: 0,
name: "",
},
@ -474,14 +474,6 @@ describe("ImageRun", () => {
rot: 2700000,
},
},
{
"a:ext": {
_attr: {
cx: 1905000,
cy: 1905000,
},
},
},
{
"a:off": {
_attr: {
@ -490,6 +482,14 @@ describe("ImageRun", () => {
},
},
},
{
"a:ext": {
_attr: {
cx: 1905000,
cy: 1905000,
},
},
},
],
},
{
@ -671,7 +671,7 @@ describe("ImageRun", () => {
{
"pic:cNvPr": {
_attr: {
desc: "",
descr: "",
id: 0,
name: "",
},
@ -727,14 +727,6 @@ describe("ImageRun", () => {
rot: 2700000,
},
},
{
"a:ext": {
_attr: {
cx: 1905000,
cy: 1905000,
},
},
},
{
"a:off": {
_attr: {
@ -743,6 +735,14 @@ describe("ImageRun", () => {
},
},
},
{
"a:ext": {
_attr: {
cx: 1905000,
cy: 1905000,
},
},
},
],
},
{
@ -927,7 +927,7 @@ describe("ImageRun", () => {
{
"pic:cNvPr": {
_attr: {
desc: "",
descr: "",
id: 0,
name: "",
},
@ -983,14 +983,6 @@ describe("ImageRun", () => {
rot: 2700000,
},
},
{
"a:ext": {
_attr: {
cx: 1905000,
cy: 1905000,
},
},
},
{
"a:off": {
_attr: {
@ -999,6 +991,14 @@ describe("ImageRun", () => {
},
},
},
{
"a:ext": {
_attr: {
cx: 1905000,
cy: 1905000,
},
},
},
],
},
{