diff --git a/docx-core/src/documents/elements/drawing.rs b/docx-core/src/documents/elements/drawing.rs index 8b5a1c6..deb3355 100644 --- a/docx-core/src/documents/elements/drawing.rs +++ b/docx-core/src/documents/elements/drawing.rs @@ -1,22 +1,56 @@ use super::*; -use serde::Serialize; +use serde::{ser::*, Serialize}; use crate::documents::BuildXML; use crate::types::*; use crate::xml_builder::*; -#[derive(Debug, Clone, Serialize, PartialEq, Default)] -#[serde(rename_all = "camelCase")] +#[derive(Debug, Clone, PartialEq, Default)] pub struct Drawing { pub data: Option, } -#[derive(Debug, Clone, Serialize, PartialEq)] -#[serde(rename_all = "camelCase")] +impl Serialize for Drawing { + fn serialize(&self, serializer: S) -> Result + where + S: Serializer, + { + match self.data { + Some(DrawingData::Pic(ref pic)) => { + let mut t = serializer.serialize_struct("Drawing", 2)?; + t.serialize_field("type", "pic")?; + t.serialize_field("data", pic)?; + t.end() + } + _ => { + let t = serializer.serialize_struct("Drawing", 2)?; + t.end() + } + } + } +} + +#[derive(Debug, Clone, PartialEq)] pub enum DrawingData { Pic(Pic), } +impl Serialize for DrawingData { + fn serialize(&self, serializer: S) -> Result + where + S: Serializer, + { + match *self { + DrawingData::Pic(ref pic) => { + let mut t = serializer.serialize_struct("Pic", 2)?; + t.serialize_field("type", "pic")?; + t.serialize_field("data", pic)?; + t.end() + } + } + } +} + impl Drawing { pub fn new() -> Drawing { Default::default() diff --git a/docx-core/src/documents/elements/pic.rs b/docx-core/src/documents/elements/pic.rs index 95b6854..87ba5d6 100644 --- a/docx-core/src/documents/elements/pic.rs +++ b/docx-core/src/documents/elements/pic.rs @@ -5,23 +5,8 @@ use crate::documents::*; use crate::types::*; use crate::xml_builder::*; -#[derive(Debug, Clone, Copy, Serialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub enum PicAlign { - Left, - Right, - Bottom, - Top, -} - -#[derive(Debug, Clone, Copy, Serialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub enum DrawingPosition { - Offset(i32), - Align(PicAlign), -} - -#[derive(Debug, Clone, Serialize, PartialEq)] +#[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS)] +#[ts(export)] #[serde(rename_all = "camelCase")] pub struct Pic { pub id: String, @@ -62,8 +47,7 @@ pub struct Pic { } impl Pic { - pub fn - new(buf: Vec) -> Pic { + pub fn new(buf: Vec) -> Pic { let id = create_pic_rid(generate_pic_id()); let dimg = image::load_from_memory(&buf).unwrap(); let size = dimg.dimensions(); diff --git a/docx-core/src/reader/drawing.rs b/docx-core/src/reader/drawing.rs index 42d650d..42130a0 100644 --- a/docx-core/src/reader/drawing.rs +++ b/docx-core/src/reader/drawing.rs @@ -6,6 +6,7 @@ use std::str::FromStr; use xml::attribute::OwnedAttribute; use xml::reader::{EventReader, XmlEvent}; +use crate::types::*; use crate::{DrawingPositionType, RelativeFromHType, RelativeFromVType}; use super::*; diff --git a/docx-core/src/types/drawing_position.rs b/docx-core/src/types/drawing_position.rs index dae9015..7088736 100644 --- a/docx-core/src/types/drawing_position.rs +++ b/docx-core/src/types/drawing_position.rs @@ -3,9 +3,29 @@ use serde::Serialize; use wasm_bindgen::prelude::*; #[wasm_bindgen] -#[derive(Debug, Clone, Copy, Serialize, PartialEq)] +#[derive(Debug, Clone, Copy, Serialize, PartialEq, ts_rs::TS)] +#[ts(export)] #[serde(rename_all = "camelCase")] pub enum DrawingPositionType { Anchor, Inline, } + +#[wasm_bindgen] +#[derive(Debug, Clone, Copy, Serialize, PartialEq, ts_rs::TS)] +#[ts(export)] +#[serde(rename_all = "camelCase")] +pub enum PicAlign { + Left, + Right, + Bottom, + Top, +} + +#[derive(Debug, Clone, Copy, Serialize, PartialEq, ts_rs::TS)] +#[ts(export)] +#[serde(rename_all = "camelCase")] +pub enum DrawingPosition { + Offset(i32), + Align(PicAlign), +} diff --git a/docx-core/src/types/relative_from_type.rs b/docx-core/src/types/relative_from_type.rs index e080496..eecf4e9 100644 --- a/docx-core/src/types/relative_from_type.rs +++ b/docx-core/src/types/relative_from_type.rs @@ -8,7 +8,8 @@ use std::str::FromStr; // @See: 20.4.3.4 ST_RelFromH (Horizontal Relative Positioning) #[wasm_bindgen] -#[derive(Debug, Clone, Copy, PartialEq, Serialize)] +#[derive(Debug, Clone, Copy, PartialEq, Serialize, ts_rs::TS)] +#[ts(export)] #[serde(rename_all = "camelCase")] pub enum RelativeFromHType { /// Specifies that the horizontal positioning shall be @@ -80,7 +81,8 @@ impl FromStr for RelativeFromHType { } #[wasm_bindgen] -#[derive(Debug, Clone, Copy, PartialEq, Serialize)] +#[derive(Debug, Clone, Copy, PartialEq, Serialize, ts_rs::TS)] +#[ts(export)] #[serde(rename_all = "camelCase")] pub enum RelativeFromVType { BottomMargin, diff --git a/docx-core/tests/snapshots/lib__reader__read_textbox.snap b/docx-core/tests/snapshots/lib__reader__read_textbox.snap index 0497edb..b7bcfdd 100644 --- a/docx-core/tests/snapshots/lib__reader__read_textbox.snap +++ b/docx-core/tests/snapshots/lib__reader__read_textbox.snap @@ -2,4 +2,4 @@ source: docx-core/tests/reader.rs expression: "&json" --- -"{\n \"contentType\": {\n \"types\": {\n \"/_rels/.rels\": \"application/vnd.openxmlformats-package.relationships+xml\",\n \"/docProps/app.xml\": \"application/vnd.openxmlformats-officedocument.extended-properties+xml\",\n \"/docProps/core.xml\": \"application/vnd.openxmlformats-package.core-properties+xml\",\n \"/docProps/custom.xml\": \"application/vnd.openxmlformats-officedocument.custom-properties+xml\",\n \"/word/_rels/document.xml.rels\": \"application/vnd.openxmlformats-package.relationships+xml\",\n \"/word/comments.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml\",\n \"/word/commentsExtended.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml\",\n \"/word/document.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml\",\n \"/word/fontTable.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml\",\n \"/word/numbering.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml\",\n \"/word/settings.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml\",\n \"/word/styles.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml\"\n },\n \"web_extension_count\": 1,\n \"custom_xml_count\": 1,\n \"header_count\": 0,\n \"footer_count\": 0\n },\n \"rels\": {\n \"rels\": [\n [\n \"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties\",\n \"rId1\",\n \"docProps/core.xml\"\n ],\n [\n \"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties\",\n \"rId2\",\n \"docProps/app.xml\"\n ],\n [\n \"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument\",\n \"rId3\",\n \"word/document.xml\"\n ],\n [\n \"http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties\",\n \"rId4\",\n \"docProps/custom.xml\"\n ]\n ]\n },\n \"documentRels\": {\n \"hasComments\": false,\n \"hasNumberings\": false,\n \"images\": [],\n \"customXmlCount\": 0,\n \"headerCount\": 0,\n \"footerCount\": 0\n },\n \"docProps\": {\n \"app\": {},\n \"core\": {\n \"config\": {\n \"created\": null,\n \"creator\": null,\n \"description\": null,\n \"language\": null,\n \"lastModifiedBy\": null,\n \"modified\": null,\n \"revision\": null,\n \"subject\": null,\n \"title\": null\n }\n },\n \"custom\": {\n \"properties\": {}\n }\n },\n \"styles\": {\n \"docDefaults\": {\n \"runPropertyDefault\": {\n \"runProperty\": {\n \"sz\": 21,\n \"szCs\": 21,\n \"fonts\": {\n \"asciiTheme\": \"minorHAnsi\",\n \"hiAnsiTheme\": \"minorHAnsi\",\n \"eastAsiaTheme\": \"minorEastAsia\",\n \"csTheme\": \"minorBidi\"\n }\n }\n }\n },\n \"styles\": [\n {\n \"styleId\": \"a\",\n \"name\": \"Normal\",\n \"styleType\": \"paragraph\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"alignment\": \"both\",\n \"widowControl\": true,\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"top\",\n \"space\": 0\n },\n \"left\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"left\",\n \"space\": 0\n },\n \"bottom\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"bottom\",\n \"space\": 0\n },\n \"right\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"right\",\n \"space\": 0\n },\n \"insideH\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideH\",\n \"space\": 0\n },\n \"insideV\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideV\",\n \"space\": 0\n }\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n },\n {\n \"styleId\": \"a0\",\n \"name\": \"Default Paragraph Font\",\n \"styleType\": \"character\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"top\",\n \"space\": 0\n },\n \"left\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"left\",\n \"space\": 0\n },\n \"bottom\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"bottom\",\n \"space\": 0\n },\n \"right\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"right\",\n \"space\": 0\n },\n \"insideH\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideH\",\n \"space\": 0\n },\n \"insideV\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideV\",\n \"space\": 0\n }\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n },\n {\n \"styleId\": \"a1\",\n \"name\": \"Normal Table\",\n \"styleType\": \"table\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": null,\n \"left\": null,\n \"bottom\": null,\n \"right\": null,\n \"insideH\": null,\n \"insideV\": null\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n },\n {\n \"styleId\": \"a2\",\n \"name\": \"No List\",\n \"styleType\": \"numbering\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"top\",\n \"space\": 0\n },\n \"left\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"left\",\n \"space\": 0\n },\n \"bottom\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"bottom\",\n \"space\": 0\n },\n \"right\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"right\",\n \"space\": 0\n },\n \"insideH\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideH\",\n \"space\": 0\n },\n \"insideV\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideV\",\n \"space\": 0\n }\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n }\n ]\n },\n \"document\": {\n \"children\": [\n {\n \"type\": \"paragraph\",\n \"data\": {\n \"id\": \"00000001\",\n \"children\": [\n {\n \"type\": \"run\",\n \"data\": {\n \"runProperty\": {},\n \"children\": [\n {\n \"type\": \"drawing\",\n \"data\": {\n \"data\": null\n }\n }\n ]\n }\n }\n ],\n \"property\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"hasNumbering\": false\n }\n }\n ],\n \"sectionProperty\": {\n \"pageSize\": {\n \"w\": 11900,\n \"h\": 16840,\n \"orient\": null\n },\n \"pageMargin\": {\n \"top\": 1985,\n \"left\": 1701,\n \"bottom\": 1701,\n \"right\": 1701,\n \"header\": 851,\n \"footer\": 992,\n \"gutter\": 0\n },\n \"columns\": 425,\n \"titlePg\": false,\n \"docGrid\": {\n \"gridType\": \"lines\",\n \"linePitch\": 360,\n \"charSpace\": null\n }\n },\n \"hasNumbering\": false\n },\n \"comments\": {\n \"comments\": []\n },\n \"numberings\": {\n \"abstractNums\": [],\n \"numberings\": []\n },\n \"settings\": {\n \"defaultTabStop\": 840,\n \"zoom\": 100,\n \"docId\": \"C11ED300-8EA6-3D41-8D67-5E5DE3410CF8\",\n \"docVars\": [],\n \"evenAndOddHeaders\": false\n },\n \"fontTable\": {},\n \"media\": [],\n \"commentsExtended\": {\n \"children\": []\n },\n \"webSettings\": {\n \"divs\": []\n },\n \"taskpanes\": null,\n \"taskpanesRels\": {\n \"rels\": []\n },\n \"webExtensions\": [],\n \"customItems\": [],\n \"customItemProps\": [],\n \"customItemRels\": [],\n \"themes\": [\n {\n \"fontSchema\": {\n \"majorFont\": {\n \"latin\": \"游ゴシック Light\",\n \"ea\": \"\",\n \"cs\": \"\",\n \"fonts\": [\n {\n \"script\": \"Jpan\",\n \"typeface\": \"游ゴシック Light\"\n },\n {\n \"script\": \"Hang\",\n \"typeface\": \"맑은 고딕\"\n },\n {\n \"script\": \"Hans\",\n \"typeface\": \"等线 Light\"\n },\n {\n \"script\": \"Hant\",\n \"typeface\": \"新細明體\"\n },\n {\n \"script\": \"Arab\",\n \"typeface\": \"Times New Roman\"\n },\n {\n \"script\": \"Hebr\",\n \"typeface\": \"Times New Roman\"\n },\n {\n \"script\": \"Thai\",\n \"typeface\": \"Angsana New\"\n },\n {\n \"script\": \"Ethi\",\n \"typeface\": \"Nyala\"\n },\n {\n \"script\": \"Beng\",\n \"typeface\": \"Vrinda\"\n },\n {\n \"script\": \"Gujr\",\n \"typeface\": \"Shruti\"\n },\n {\n \"script\": \"Khmr\",\n \"typeface\": \"MoolBoran\"\n },\n {\n \"script\": \"Knda\",\n \"typeface\": \"Tunga\"\n },\n {\n \"script\": \"Guru\",\n \"typeface\": \"Raavi\"\n },\n {\n \"script\": \"Cans\",\n \"typeface\": \"Euphemia\"\n },\n {\n \"script\": \"Cher\",\n \"typeface\": \"Plantagenet Cherokee\"\n },\n {\n \"script\": \"Yiii\",\n \"typeface\": \"Microsoft Yi Baiti\"\n },\n {\n \"script\": \"Tibt\",\n \"typeface\": \"Microsoft Himalaya\"\n },\n {\n \"script\": \"Thaa\",\n \"typeface\": \"MV Boli\"\n },\n {\n \"script\": \"Deva\",\n \"typeface\": \"Mangal\"\n },\n {\n \"script\": \"Telu\",\n \"typeface\": \"Gautami\"\n },\n {\n \"script\": \"Taml\",\n \"typeface\": \"Latha\"\n },\n {\n \"script\": \"Syrc\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Orya\",\n \"typeface\": \"Kalinga\"\n },\n {\n \"script\": \"Mlym\",\n \"typeface\": \"Kartika\"\n },\n {\n \"script\": \"Laoo\",\n \"typeface\": \"DokChampa\"\n },\n {\n \"script\": \"Sinh\",\n \"typeface\": \"Iskoola Pota\"\n },\n {\n \"script\": \"Mong\",\n \"typeface\": \"Mongolian Baiti\"\n },\n {\n \"script\": \"Viet\",\n \"typeface\": \"Times New Roman\"\n },\n {\n \"script\": \"Uigh\",\n \"typeface\": \"Microsoft Uighur\"\n },\n {\n \"script\": \"Geor\",\n \"typeface\": \"Sylfaen\"\n },\n {\n \"script\": \"Armn\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Bugi\",\n \"typeface\": \"Leelawadee UI\"\n },\n {\n \"script\": \"Bopo\",\n \"typeface\": \"Microsoft JhengHei\"\n },\n {\n \"script\": \"Java\",\n \"typeface\": \"Javanese Text\"\n },\n {\n \"script\": \"Lisu\",\n \"typeface\": \"Segoe UI\"\n },\n {\n \"script\": \"Mymr\",\n \"typeface\": \"Myanmar Text\"\n },\n {\n \"script\": \"Nkoo\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Olck\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Osma\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Phag\",\n \"typeface\": \"Phagspa\"\n },\n {\n \"script\": \"Syrn\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syrj\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syre\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Sora\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Tale\",\n \"typeface\": \"Microsoft Tai Le\"\n },\n {\n \"script\": \"Talu\",\n \"typeface\": \"Microsoft New Tai Lue\"\n },\n {\n \"script\": \"Tfng\",\n \"typeface\": \"Ebrima\"\n }\n ]\n },\n \"minorFont\": {\n \"latin\": \"游明朝\",\n \"ea\": \"\",\n \"cs\": \"\",\n \"fonts\": [\n {\n \"script\": \"Jpan\",\n \"typeface\": \"游明朝\"\n },\n {\n \"script\": \"Hang\",\n \"typeface\": \"맑은 고딕\"\n },\n {\n \"script\": \"Hans\",\n \"typeface\": \"等线\"\n },\n {\n \"script\": \"Hant\",\n \"typeface\": \"新細明體\"\n },\n {\n \"script\": \"Arab\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Hebr\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Thai\",\n \"typeface\": \"Cordia New\"\n },\n {\n \"script\": \"Ethi\",\n \"typeface\": \"Nyala\"\n },\n {\n \"script\": \"Beng\",\n \"typeface\": \"Vrinda\"\n },\n {\n \"script\": \"Gujr\",\n \"typeface\": \"Shruti\"\n },\n {\n \"script\": \"Khmr\",\n \"typeface\": \"DaunPenh\"\n },\n {\n \"script\": \"Knda\",\n \"typeface\": \"Tunga\"\n },\n {\n \"script\": \"Guru\",\n \"typeface\": \"Raavi\"\n },\n {\n \"script\": \"Cans\",\n \"typeface\": \"Euphemia\"\n },\n {\n \"script\": \"Cher\",\n \"typeface\": \"Plantagenet Cherokee\"\n },\n {\n \"script\": \"Yiii\",\n \"typeface\": \"Microsoft Yi Baiti\"\n },\n {\n \"script\": \"Tibt\",\n \"typeface\": \"Microsoft Himalaya\"\n },\n {\n \"script\": \"Thaa\",\n \"typeface\": \"MV Boli\"\n },\n {\n \"script\": \"Deva\",\n \"typeface\": \"Mangal\"\n },\n {\n \"script\": \"Telu\",\n \"typeface\": \"Gautami\"\n },\n {\n \"script\": \"Taml\",\n \"typeface\": \"Latha\"\n },\n {\n \"script\": \"Syrc\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Orya\",\n \"typeface\": \"Kalinga\"\n },\n {\n \"script\": \"Mlym\",\n \"typeface\": \"Kartika\"\n },\n {\n \"script\": \"Laoo\",\n \"typeface\": \"DokChampa\"\n },\n {\n \"script\": \"Sinh\",\n \"typeface\": \"Iskoola Pota\"\n },\n {\n \"script\": \"Mong\",\n \"typeface\": \"Mongolian Baiti\"\n },\n {\n \"script\": \"Viet\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Uigh\",\n \"typeface\": \"Microsoft Uighur\"\n },\n {\n \"script\": \"Geor\",\n \"typeface\": \"Sylfaen\"\n },\n {\n \"script\": \"Armn\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Bugi\",\n \"typeface\": \"Leelawadee UI\"\n },\n {\n \"script\": \"Bopo\",\n \"typeface\": \"Microsoft JhengHei\"\n },\n {\n \"script\": \"Java\",\n \"typeface\": \"Javanese Text\"\n },\n {\n \"script\": \"Lisu\",\n \"typeface\": \"Segoe UI\"\n },\n {\n \"script\": \"Mymr\",\n \"typeface\": \"Myanmar Text\"\n },\n {\n \"script\": \"Nkoo\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Olck\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Osma\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Phag\",\n \"typeface\": \"Phagspa\"\n },\n {\n \"script\": \"Syrn\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syrj\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syre\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Sora\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Tale\",\n \"typeface\": \"Microsoft Tai Le\"\n },\n {\n \"script\": \"Talu\",\n \"typeface\": \"Microsoft New Tai Lue\"\n },\n {\n \"script\": \"Tfng\",\n \"typeface\": \"Ebrima\"\n }\n ]\n }\n }\n }\n ],\n \"images\": []\n}" +"{\n \"contentType\": {\n \"types\": {\n \"/_rels/.rels\": \"application/vnd.openxmlformats-package.relationships+xml\",\n \"/docProps/app.xml\": \"application/vnd.openxmlformats-officedocument.extended-properties+xml\",\n \"/docProps/core.xml\": \"application/vnd.openxmlformats-package.core-properties+xml\",\n \"/docProps/custom.xml\": \"application/vnd.openxmlformats-officedocument.custom-properties+xml\",\n \"/word/_rels/document.xml.rels\": \"application/vnd.openxmlformats-package.relationships+xml\",\n \"/word/comments.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml\",\n \"/word/commentsExtended.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml\",\n \"/word/document.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml\",\n \"/word/fontTable.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml\",\n \"/word/numbering.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml\",\n \"/word/settings.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml\",\n \"/word/styles.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml\"\n },\n \"web_extension_count\": 1,\n \"custom_xml_count\": 1,\n \"header_count\": 0,\n \"footer_count\": 0\n },\n \"rels\": {\n \"rels\": [\n [\n \"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties\",\n \"rId1\",\n \"docProps/core.xml\"\n ],\n [\n \"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties\",\n \"rId2\",\n \"docProps/app.xml\"\n ],\n [\n \"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument\",\n \"rId3\",\n \"word/document.xml\"\n ],\n [\n \"http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties\",\n \"rId4\",\n \"docProps/custom.xml\"\n ]\n ]\n },\n \"documentRels\": {\n \"hasComments\": false,\n \"hasNumberings\": false,\n \"images\": [],\n \"customXmlCount\": 0,\n \"headerCount\": 0,\n \"footerCount\": 0\n },\n \"docProps\": {\n \"app\": {},\n \"core\": {\n \"config\": {\n \"created\": null,\n \"creator\": null,\n \"description\": null,\n \"language\": null,\n \"lastModifiedBy\": null,\n \"modified\": null,\n \"revision\": null,\n \"subject\": null,\n \"title\": null\n }\n },\n \"custom\": {\n \"properties\": {}\n }\n },\n \"styles\": {\n \"docDefaults\": {\n \"runPropertyDefault\": {\n \"runProperty\": {\n \"sz\": 21,\n \"szCs\": 21,\n \"fonts\": {\n \"asciiTheme\": \"minorHAnsi\",\n \"hiAnsiTheme\": \"minorHAnsi\",\n \"eastAsiaTheme\": \"minorEastAsia\",\n \"csTheme\": \"minorBidi\"\n }\n }\n }\n },\n \"styles\": [\n {\n \"styleId\": \"a\",\n \"name\": \"Normal\",\n \"styleType\": \"paragraph\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"alignment\": \"both\",\n \"widowControl\": true,\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"top\",\n \"space\": 0\n },\n \"left\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"left\",\n \"space\": 0\n },\n \"bottom\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"bottom\",\n \"space\": 0\n },\n \"right\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"right\",\n \"space\": 0\n },\n \"insideH\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideH\",\n \"space\": 0\n },\n \"insideV\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideV\",\n \"space\": 0\n }\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n },\n {\n \"styleId\": \"a0\",\n \"name\": \"Default Paragraph Font\",\n \"styleType\": \"character\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"top\",\n \"space\": 0\n },\n \"left\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"left\",\n \"space\": 0\n },\n \"bottom\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"bottom\",\n \"space\": 0\n },\n \"right\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"right\",\n \"space\": 0\n },\n \"insideH\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideH\",\n \"space\": 0\n },\n \"insideV\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideV\",\n \"space\": 0\n }\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n },\n {\n \"styleId\": \"a1\",\n \"name\": \"Normal Table\",\n \"styleType\": \"table\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": null,\n \"left\": null,\n \"bottom\": null,\n \"right\": null,\n \"insideH\": null,\n \"insideV\": null\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n },\n {\n \"styleId\": \"a2\",\n \"name\": \"No List\",\n \"styleType\": \"numbering\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"top\",\n \"space\": 0\n },\n \"left\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"left\",\n \"space\": 0\n },\n \"bottom\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"bottom\",\n \"space\": 0\n },\n \"right\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"right\",\n \"space\": 0\n },\n \"insideH\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideH\",\n \"space\": 0\n },\n \"insideV\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideV\",\n \"space\": 0\n }\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n }\n ]\n },\n \"document\": {\n \"children\": [\n {\n \"type\": \"paragraph\",\n \"data\": {\n \"id\": \"00000001\",\n \"children\": [\n {\n \"type\": \"run\",\n \"data\": {\n \"runProperty\": {},\n \"children\": [\n {\n \"type\": \"drawing\",\n \"data\": {}\n }\n ]\n }\n }\n ],\n \"property\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"hasNumbering\": false\n }\n }\n ],\n \"sectionProperty\": {\n \"pageSize\": {\n \"w\": 11900,\n \"h\": 16840,\n \"orient\": null\n },\n \"pageMargin\": {\n \"top\": 1985,\n \"left\": 1701,\n \"bottom\": 1701,\n \"right\": 1701,\n \"header\": 851,\n \"footer\": 992,\n \"gutter\": 0\n },\n \"columns\": 425,\n \"titlePg\": false,\n \"docGrid\": {\n \"gridType\": \"lines\",\n \"linePitch\": 360,\n \"charSpace\": null\n }\n },\n \"hasNumbering\": false\n },\n \"comments\": {\n \"comments\": []\n },\n \"numberings\": {\n \"abstractNums\": [],\n \"numberings\": []\n },\n \"settings\": {\n \"defaultTabStop\": 840,\n \"zoom\": 100,\n \"docId\": \"C11ED300-8EA6-3D41-8D67-5E5DE3410CF8\",\n \"docVars\": [],\n \"evenAndOddHeaders\": false\n },\n \"fontTable\": {},\n \"media\": [],\n \"commentsExtended\": {\n \"children\": []\n },\n \"webSettings\": {\n \"divs\": []\n },\n \"taskpanes\": null,\n \"taskpanesRels\": {\n \"rels\": []\n },\n \"webExtensions\": [],\n \"customItems\": [],\n \"customItemProps\": [],\n \"customItemRels\": [],\n \"themes\": [\n {\n \"fontSchema\": {\n \"majorFont\": {\n \"latin\": \"游ゴシック Light\",\n \"ea\": \"\",\n \"cs\": \"\",\n \"fonts\": [\n {\n \"script\": \"Jpan\",\n \"typeface\": \"游ゴシック Light\"\n },\n {\n \"script\": \"Hang\",\n \"typeface\": \"맑은 고딕\"\n },\n {\n \"script\": \"Hans\",\n \"typeface\": \"等线 Light\"\n },\n {\n \"script\": \"Hant\",\n \"typeface\": \"新細明體\"\n },\n {\n \"script\": \"Arab\",\n \"typeface\": \"Times New Roman\"\n },\n {\n \"script\": \"Hebr\",\n \"typeface\": \"Times New Roman\"\n },\n {\n \"script\": \"Thai\",\n \"typeface\": \"Angsana New\"\n },\n {\n \"script\": \"Ethi\",\n \"typeface\": \"Nyala\"\n },\n {\n \"script\": \"Beng\",\n \"typeface\": \"Vrinda\"\n },\n {\n \"script\": \"Gujr\",\n \"typeface\": \"Shruti\"\n },\n {\n \"script\": \"Khmr\",\n \"typeface\": \"MoolBoran\"\n },\n {\n \"script\": \"Knda\",\n \"typeface\": \"Tunga\"\n },\n {\n \"script\": \"Guru\",\n \"typeface\": \"Raavi\"\n },\n {\n \"script\": \"Cans\",\n \"typeface\": \"Euphemia\"\n },\n {\n \"script\": \"Cher\",\n \"typeface\": \"Plantagenet Cherokee\"\n },\n {\n \"script\": \"Yiii\",\n \"typeface\": \"Microsoft Yi Baiti\"\n },\n {\n \"script\": \"Tibt\",\n \"typeface\": \"Microsoft Himalaya\"\n },\n {\n \"script\": \"Thaa\",\n \"typeface\": \"MV Boli\"\n },\n {\n \"script\": \"Deva\",\n \"typeface\": \"Mangal\"\n },\n {\n \"script\": \"Telu\",\n \"typeface\": \"Gautami\"\n },\n {\n \"script\": \"Taml\",\n \"typeface\": \"Latha\"\n },\n {\n \"script\": \"Syrc\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Orya\",\n \"typeface\": \"Kalinga\"\n },\n {\n \"script\": \"Mlym\",\n \"typeface\": \"Kartika\"\n },\n {\n \"script\": \"Laoo\",\n \"typeface\": \"DokChampa\"\n },\n {\n \"script\": \"Sinh\",\n \"typeface\": \"Iskoola Pota\"\n },\n {\n \"script\": \"Mong\",\n \"typeface\": \"Mongolian Baiti\"\n },\n {\n \"script\": \"Viet\",\n \"typeface\": \"Times New Roman\"\n },\n {\n \"script\": \"Uigh\",\n \"typeface\": \"Microsoft Uighur\"\n },\n {\n \"script\": \"Geor\",\n \"typeface\": \"Sylfaen\"\n },\n {\n \"script\": \"Armn\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Bugi\",\n \"typeface\": \"Leelawadee UI\"\n },\n {\n \"script\": \"Bopo\",\n \"typeface\": \"Microsoft JhengHei\"\n },\n {\n \"script\": \"Java\",\n \"typeface\": \"Javanese Text\"\n },\n {\n \"script\": \"Lisu\",\n \"typeface\": \"Segoe UI\"\n },\n {\n \"script\": \"Mymr\",\n \"typeface\": \"Myanmar Text\"\n },\n {\n \"script\": \"Nkoo\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Olck\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Osma\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Phag\",\n \"typeface\": \"Phagspa\"\n },\n {\n \"script\": \"Syrn\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syrj\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syre\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Sora\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Tale\",\n \"typeface\": \"Microsoft Tai Le\"\n },\n {\n \"script\": \"Talu\",\n \"typeface\": \"Microsoft New Tai Lue\"\n },\n {\n \"script\": \"Tfng\",\n \"typeface\": \"Ebrima\"\n }\n ]\n },\n \"minorFont\": {\n \"latin\": \"游明朝\",\n \"ea\": \"\",\n \"cs\": \"\",\n \"fonts\": [\n {\n \"script\": \"Jpan\",\n \"typeface\": \"游明朝\"\n },\n {\n \"script\": \"Hang\",\n \"typeface\": \"맑은 고딕\"\n },\n {\n \"script\": \"Hans\",\n \"typeface\": \"等线\"\n },\n {\n \"script\": \"Hant\",\n \"typeface\": \"新細明體\"\n },\n {\n \"script\": \"Arab\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Hebr\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Thai\",\n \"typeface\": \"Cordia New\"\n },\n {\n \"script\": \"Ethi\",\n \"typeface\": \"Nyala\"\n },\n {\n \"script\": \"Beng\",\n \"typeface\": \"Vrinda\"\n },\n {\n \"script\": \"Gujr\",\n \"typeface\": \"Shruti\"\n },\n {\n \"script\": \"Khmr\",\n \"typeface\": \"DaunPenh\"\n },\n {\n \"script\": \"Knda\",\n \"typeface\": \"Tunga\"\n },\n {\n \"script\": \"Guru\",\n \"typeface\": \"Raavi\"\n },\n {\n \"script\": \"Cans\",\n \"typeface\": \"Euphemia\"\n },\n {\n \"script\": \"Cher\",\n \"typeface\": \"Plantagenet Cherokee\"\n },\n {\n \"script\": \"Yiii\",\n \"typeface\": \"Microsoft Yi Baiti\"\n },\n {\n \"script\": \"Tibt\",\n \"typeface\": \"Microsoft Himalaya\"\n },\n {\n \"script\": \"Thaa\",\n \"typeface\": \"MV Boli\"\n },\n {\n \"script\": \"Deva\",\n \"typeface\": \"Mangal\"\n },\n {\n \"script\": \"Telu\",\n \"typeface\": \"Gautami\"\n },\n {\n \"script\": \"Taml\",\n \"typeface\": \"Latha\"\n },\n {\n \"script\": \"Syrc\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Orya\",\n \"typeface\": \"Kalinga\"\n },\n {\n \"script\": \"Mlym\",\n \"typeface\": \"Kartika\"\n },\n {\n \"script\": \"Laoo\",\n \"typeface\": \"DokChampa\"\n },\n {\n \"script\": \"Sinh\",\n \"typeface\": \"Iskoola Pota\"\n },\n {\n \"script\": \"Mong\",\n \"typeface\": \"Mongolian Baiti\"\n },\n {\n \"script\": \"Viet\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Uigh\",\n \"typeface\": \"Microsoft Uighur\"\n },\n {\n \"script\": \"Geor\",\n \"typeface\": \"Sylfaen\"\n },\n {\n \"script\": \"Armn\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Bugi\",\n \"typeface\": \"Leelawadee UI\"\n },\n {\n \"script\": \"Bopo\",\n \"typeface\": \"Microsoft JhengHei\"\n },\n {\n \"script\": \"Java\",\n \"typeface\": \"Javanese Text\"\n },\n {\n \"script\": \"Lisu\",\n \"typeface\": \"Segoe UI\"\n },\n {\n \"script\": \"Mymr\",\n \"typeface\": \"Myanmar Text\"\n },\n {\n \"script\": \"Nkoo\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Olck\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Osma\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Phag\",\n \"typeface\": \"Phagspa\"\n },\n {\n \"script\": \"Syrn\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syrj\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syre\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Sora\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Tale\",\n \"typeface\": \"Microsoft Tai Le\"\n },\n {\n \"script\": \"Talu\",\n \"typeface\": \"Microsoft New Tai Lue\"\n },\n {\n \"script\": \"Tfng\",\n \"typeface\": \"Ebrima\"\n }\n ]\n }\n }\n }\n ],\n \"images\": []\n}" diff --git a/docx-core/tests/snapshots/reader__read_textbox.snap b/docx-core/tests/snapshots/reader__read_textbox.snap index 0497edb..b7bcfdd 100644 --- a/docx-core/tests/snapshots/reader__read_textbox.snap +++ b/docx-core/tests/snapshots/reader__read_textbox.snap @@ -2,4 +2,4 @@ source: docx-core/tests/reader.rs expression: "&json" --- -"{\n \"contentType\": {\n \"types\": {\n \"/_rels/.rels\": \"application/vnd.openxmlformats-package.relationships+xml\",\n \"/docProps/app.xml\": \"application/vnd.openxmlformats-officedocument.extended-properties+xml\",\n \"/docProps/core.xml\": \"application/vnd.openxmlformats-package.core-properties+xml\",\n \"/docProps/custom.xml\": \"application/vnd.openxmlformats-officedocument.custom-properties+xml\",\n \"/word/_rels/document.xml.rels\": \"application/vnd.openxmlformats-package.relationships+xml\",\n \"/word/comments.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml\",\n \"/word/commentsExtended.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml\",\n \"/word/document.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml\",\n \"/word/fontTable.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml\",\n \"/word/numbering.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml\",\n \"/word/settings.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml\",\n \"/word/styles.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml\"\n },\n \"web_extension_count\": 1,\n \"custom_xml_count\": 1,\n \"header_count\": 0,\n \"footer_count\": 0\n },\n \"rels\": {\n \"rels\": [\n [\n \"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties\",\n \"rId1\",\n \"docProps/core.xml\"\n ],\n [\n \"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties\",\n \"rId2\",\n \"docProps/app.xml\"\n ],\n [\n \"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument\",\n \"rId3\",\n \"word/document.xml\"\n ],\n [\n \"http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties\",\n \"rId4\",\n \"docProps/custom.xml\"\n ]\n ]\n },\n \"documentRels\": {\n \"hasComments\": false,\n \"hasNumberings\": false,\n \"images\": [],\n \"customXmlCount\": 0,\n \"headerCount\": 0,\n \"footerCount\": 0\n },\n \"docProps\": {\n \"app\": {},\n \"core\": {\n \"config\": {\n \"created\": null,\n \"creator\": null,\n \"description\": null,\n \"language\": null,\n \"lastModifiedBy\": null,\n \"modified\": null,\n \"revision\": null,\n \"subject\": null,\n \"title\": null\n }\n },\n \"custom\": {\n \"properties\": {}\n }\n },\n \"styles\": {\n \"docDefaults\": {\n \"runPropertyDefault\": {\n \"runProperty\": {\n \"sz\": 21,\n \"szCs\": 21,\n \"fonts\": {\n \"asciiTheme\": \"minorHAnsi\",\n \"hiAnsiTheme\": \"minorHAnsi\",\n \"eastAsiaTheme\": \"minorEastAsia\",\n \"csTheme\": \"minorBidi\"\n }\n }\n }\n },\n \"styles\": [\n {\n \"styleId\": \"a\",\n \"name\": \"Normal\",\n \"styleType\": \"paragraph\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"alignment\": \"both\",\n \"widowControl\": true,\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"top\",\n \"space\": 0\n },\n \"left\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"left\",\n \"space\": 0\n },\n \"bottom\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"bottom\",\n \"space\": 0\n },\n \"right\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"right\",\n \"space\": 0\n },\n \"insideH\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideH\",\n \"space\": 0\n },\n \"insideV\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideV\",\n \"space\": 0\n }\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n },\n {\n \"styleId\": \"a0\",\n \"name\": \"Default Paragraph Font\",\n \"styleType\": \"character\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"top\",\n \"space\": 0\n },\n \"left\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"left\",\n \"space\": 0\n },\n \"bottom\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"bottom\",\n \"space\": 0\n },\n \"right\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"right\",\n \"space\": 0\n },\n \"insideH\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideH\",\n \"space\": 0\n },\n \"insideV\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideV\",\n \"space\": 0\n }\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n },\n {\n \"styleId\": \"a1\",\n \"name\": \"Normal Table\",\n \"styleType\": \"table\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": null,\n \"left\": null,\n \"bottom\": null,\n \"right\": null,\n \"insideH\": null,\n \"insideV\": null\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n },\n {\n \"styleId\": \"a2\",\n \"name\": \"No List\",\n \"styleType\": \"numbering\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"top\",\n \"space\": 0\n },\n \"left\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"left\",\n \"space\": 0\n },\n \"bottom\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"bottom\",\n \"space\": 0\n },\n \"right\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"right\",\n \"space\": 0\n },\n \"insideH\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideH\",\n \"space\": 0\n },\n \"insideV\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideV\",\n \"space\": 0\n }\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n }\n ]\n },\n \"document\": {\n \"children\": [\n {\n \"type\": \"paragraph\",\n \"data\": {\n \"id\": \"00000001\",\n \"children\": [\n {\n \"type\": \"run\",\n \"data\": {\n \"runProperty\": {},\n \"children\": [\n {\n \"type\": \"drawing\",\n \"data\": {\n \"data\": null\n }\n }\n ]\n }\n }\n ],\n \"property\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"hasNumbering\": false\n }\n }\n ],\n \"sectionProperty\": {\n \"pageSize\": {\n \"w\": 11900,\n \"h\": 16840,\n \"orient\": null\n },\n \"pageMargin\": {\n \"top\": 1985,\n \"left\": 1701,\n \"bottom\": 1701,\n \"right\": 1701,\n \"header\": 851,\n \"footer\": 992,\n \"gutter\": 0\n },\n \"columns\": 425,\n \"titlePg\": false,\n \"docGrid\": {\n \"gridType\": \"lines\",\n \"linePitch\": 360,\n \"charSpace\": null\n }\n },\n \"hasNumbering\": false\n },\n \"comments\": {\n \"comments\": []\n },\n \"numberings\": {\n \"abstractNums\": [],\n \"numberings\": []\n },\n \"settings\": {\n \"defaultTabStop\": 840,\n \"zoom\": 100,\n \"docId\": \"C11ED300-8EA6-3D41-8D67-5E5DE3410CF8\",\n \"docVars\": [],\n \"evenAndOddHeaders\": false\n },\n \"fontTable\": {},\n \"media\": [],\n \"commentsExtended\": {\n \"children\": []\n },\n \"webSettings\": {\n \"divs\": []\n },\n \"taskpanes\": null,\n \"taskpanesRels\": {\n \"rels\": []\n },\n \"webExtensions\": [],\n \"customItems\": [],\n \"customItemProps\": [],\n \"customItemRels\": [],\n \"themes\": [\n {\n \"fontSchema\": {\n \"majorFont\": {\n \"latin\": \"游ゴシック Light\",\n \"ea\": \"\",\n \"cs\": \"\",\n \"fonts\": [\n {\n \"script\": \"Jpan\",\n \"typeface\": \"游ゴシック Light\"\n },\n {\n \"script\": \"Hang\",\n \"typeface\": \"맑은 고딕\"\n },\n {\n \"script\": \"Hans\",\n \"typeface\": \"等线 Light\"\n },\n {\n \"script\": \"Hant\",\n \"typeface\": \"新細明體\"\n },\n {\n \"script\": \"Arab\",\n \"typeface\": \"Times New Roman\"\n },\n {\n \"script\": \"Hebr\",\n \"typeface\": \"Times New Roman\"\n },\n {\n \"script\": \"Thai\",\n \"typeface\": \"Angsana New\"\n },\n {\n \"script\": \"Ethi\",\n \"typeface\": \"Nyala\"\n },\n {\n \"script\": \"Beng\",\n \"typeface\": \"Vrinda\"\n },\n {\n \"script\": \"Gujr\",\n \"typeface\": \"Shruti\"\n },\n {\n \"script\": \"Khmr\",\n \"typeface\": \"MoolBoran\"\n },\n {\n \"script\": \"Knda\",\n \"typeface\": \"Tunga\"\n },\n {\n \"script\": \"Guru\",\n \"typeface\": \"Raavi\"\n },\n {\n \"script\": \"Cans\",\n \"typeface\": \"Euphemia\"\n },\n {\n \"script\": \"Cher\",\n \"typeface\": \"Plantagenet Cherokee\"\n },\n {\n \"script\": \"Yiii\",\n \"typeface\": \"Microsoft Yi Baiti\"\n },\n {\n \"script\": \"Tibt\",\n \"typeface\": \"Microsoft Himalaya\"\n },\n {\n \"script\": \"Thaa\",\n \"typeface\": \"MV Boli\"\n },\n {\n \"script\": \"Deva\",\n \"typeface\": \"Mangal\"\n },\n {\n \"script\": \"Telu\",\n \"typeface\": \"Gautami\"\n },\n {\n \"script\": \"Taml\",\n \"typeface\": \"Latha\"\n },\n {\n \"script\": \"Syrc\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Orya\",\n \"typeface\": \"Kalinga\"\n },\n {\n \"script\": \"Mlym\",\n \"typeface\": \"Kartika\"\n },\n {\n \"script\": \"Laoo\",\n \"typeface\": \"DokChampa\"\n },\n {\n \"script\": \"Sinh\",\n \"typeface\": \"Iskoola Pota\"\n },\n {\n \"script\": \"Mong\",\n \"typeface\": \"Mongolian Baiti\"\n },\n {\n \"script\": \"Viet\",\n \"typeface\": \"Times New Roman\"\n },\n {\n \"script\": \"Uigh\",\n \"typeface\": \"Microsoft Uighur\"\n },\n {\n \"script\": \"Geor\",\n \"typeface\": \"Sylfaen\"\n },\n {\n \"script\": \"Armn\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Bugi\",\n \"typeface\": \"Leelawadee UI\"\n },\n {\n \"script\": \"Bopo\",\n \"typeface\": \"Microsoft JhengHei\"\n },\n {\n \"script\": \"Java\",\n \"typeface\": \"Javanese Text\"\n },\n {\n \"script\": \"Lisu\",\n \"typeface\": \"Segoe UI\"\n },\n {\n \"script\": \"Mymr\",\n \"typeface\": \"Myanmar Text\"\n },\n {\n \"script\": \"Nkoo\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Olck\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Osma\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Phag\",\n \"typeface\": \"Phagspa\"\n },\n {\n \"script\": \"Syrn\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syrj\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syre\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Sora\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Tale\",\n \"typeface\": \"Microsoft Tai Le\"\n },\n {\n \"script\": \"Talu\",\n \"typeface\": \"Microsoft New Tai Lue\"\n },\n {\n \"script\": \"Tfng\",\n \"typeface\": \"Ebrima\"\n }\n ]\n },\n \"minorFont\": {\n \"latin\": \"游明朝\",\n \"ea\": \"\",\n \"cs\": \"\",\n \"fonts\": [\n {\n \"script\": \"Jpan\",\n \"typeface\": \"游明朝\"\n },\n {\n \"script\": \"Hang\",\n \"typeface\": \"맑은 고딕\"\n },\n {\n \"script\": \"Hans\",\n \"typeface\": \"等线\"\n },\n {\n \"script\": \"Hant\",\n \"typeface\": \"新細明體\"\n },\n {\n \"script\": \"Arab\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Hebr\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Thai\",\n \"typeface\": \"Cordia New\"\n },\n {\n \"script\": \"Ethi\",\n \"typeface\": \"Nyala\"\n },\n {\n \"script\": \"Beng\",\n \"typeface\": \"Vrinda\"\n },\n {\n \"script\": \"Gujr\",\n \"typeface\": \"Shruti\"\n },\n {\n \"script\": \"Khmr\",\n \"typeface\": \"DaunPenh\"\n },\n {\n \"script\": \"Knda\",\n \"typeface\": \"Tunga\"\n },\n {\n \"script\": \"Guru\",\n \"typeface\": \"Raavi\"\n },\n {\n \"script\": \"Cans\",\n \"typeface\": \"Euphemia\"\n },\n {\n \"script\": \"Cher\",\n \"typeface\": \"Plantagenet Cherokee\"\n },\n {\n \"script\": \"Yiii\",\n \"typeface\": \"Microsoft Yi Baiti\"\n },\n {\n \"script\": \"Tibt\",\n \"typeface\": \"Microsoft Himalaya\"\n },\n {\n \"script\": \"Thaa\",\n \"typeface\": \"MV Boli\"\n },\n {\n \"script\": \"Deva\",\n \"typeface\": \"Mangal\"\n },\n {\n \"script\": \"Telu\",\n \"typeface\": \"Gautami\"\n },\n {\n \"script\": \"Taml\",\n \"typeface\": \"Latha\"\n },\n {\n \"script\": \"Syrc\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Orya\",\n \"typeface\": \"Kalinga\"\n },\n {\n \"script\": \"Mlym\",\n \"typeface\": \"Kartika\"\n },\n {\n \"script\": \"Laoo\",\n \"typeface\": \"DokChampa\"\n },\n {\n \"script\": \"Sinh\",\n \"typeface\": \"Iskoola Pota\"\n },\n {\n \"script\": \"Mong\",\n \"typeface\": \"Mongolian Baiti\"\n },\n {\n \"script\": \"Viet\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Uigh\",\n \"typeface\": \"Microsoft Uighur\"\n },\n {\n \"script\": \"Geor\",\n \"typeface\": \"Sylfaen\"\n },\n {\n \"script\": \"Armn\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Bugi\",\n \"typeface\": \"Leelawadee UI\"\n },\n {\n \"script\": \"Bopo\",\n \"typeface\": \"Microsoft JhengHei\"\n },\n {\n \"script\": \"Java\",\n \"typeface\": \"Javanese Text\"\n },\n {\n \"script\": \"Lisu\",\n \"typeface\": \"Segoe UI\"\n },\n {\n \"script\": \"Mymr\",\n \"typeface\": \"Myanmar Text\"\n },\n {\n \"script\": \"Nkoo\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Olck\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Osma\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Phag\",\n \"typeface\": \"Phagspa\"\n },\n {\n \"script\": \"Syrn\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syrj\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syre\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Sora\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Tale\",\n \"typeface\": \"Microsoft Tai Le\"\n },\n {\n \"script\": \"Talu\",\n \"typeface\": \"Microsoft New Tai Lue\"\n },\n {\n \"script\": \"Tfng\",\n \"typeface\": \"Ebrima\"\n }\n ]\n }\n }\n }\n ],\n \"images\": []\n}" +"{\n \"contentType\": {\n \"types\": {\n \"/_rels/.rels\": \"application/vnd.openxmlformats-package.relationships+xml\",\n \"/docProps/app.xml\": \"application/vnd.openxmlformats-officedocument.extended-properties+xml\",\n \"/docProps/core.xml\": \"application/vnd.openxmlformats-package.core-properties+xml\",\n \"/docProps/custom.xml\": \"application/vnd.openxmlformats-officedocument.custom-properties+xml\",\n \"/word/_rels/document.xml.rels\": \"application/vnd.openxmlformats-package.relationships+xml\",\n \"/word/comments.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml\",\n \"/word/commentsExtended.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml\",\n \"/word/document.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml\",\n \"/word/fontTable.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml\",\n \"/word/numbering.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml\",\n \"/word/settings.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml\",\n \"/word/styles.xml\": \"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml\"\n },\n \"web_extension_count\": 1,\n \"custom_xml_count\": 1,\n \"header_count\": 0,\n \"footer_count\": 0\n },\n \"rels\": {\n \"rels\": [\n [\n \"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties\",\n \"rId1\",\n \"docProps/core.xml\"\n ],\n [\n \"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties\",\n \"rId2\",\n \"docProps/app.xml\"\n ],\n [\n \"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument\",\n \"rId3\",\n \"word/document.xml\"\n ],\n [\n \"http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties\",\n \"rId4\",\n \"docProps/custom.xml\"\n ]\n ]\n },\n \"documentRels\": {\n \"hasComments\": false,\n \"hasNumberings\": false,\n \"images\": [],\n \"customXmlCount\": 0,\n \"headerCount\": 0,\n \"footerCount\": 0\n },\n \"docProps\": {\n \"app\": {},\n \"core\": {\n \"config\": {\n \"created\": null,\n \"creator\": null,\n \"description\": null,\n \"language\": null,\n \"lastModifiedBy\": null,\n \"modified\": null,\n \"revision\": null,\n \"subject\": null,\n \"title\": null\n }\n },\n \"custom\": {\n \"properties\": {}\n }\n },\n \"styles\": {\n \"docDefaults\": {\n \"runPropertyDefault\": {\n \"runProperty\": {\n \"sz\": 21,\n \"szCs\": 21,\n \"fonts\": {\n \"asciiTheme\": \"minorHAnsi\",\n \"hiAnsiTheme\": \"minorHAnsi\",\n \"eastAsiaTheme\": \"minorEastAsia\",\n \"csTheme\": \"minorBidi\"\n }\n }\n }\n },\n \"styles\": [\n {\n \"styleId\": \"a\",\n \"name\": \"Normal\",\n \"styleType\": \"paragraph\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"alignment\": \"both\",\n \"widowControl\": true,\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"top\",\n \"space\": 0\n },\n \"left\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"left\",\n \"space\": 0\n },\n \"bottom\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"bottom\",\n \"space\": 0\n },\n \"right\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"right\",\n \"space\": 0\n },\n \"insideH\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideH\",\n \"space\": 0\n },\n \"insideV\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideV\",\n \"space\": 0\n }\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n },\n {\n \"styleId\": \"a0\",\n \"name\": \"Default Paragraph Font\",\n \"styleType\": \"character\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"top\",\n \"space\": 0\n },\n \"left\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"left\",\n \"space\": 0\n },\n \"bottom\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"bottom\",\n \"space\": 0\n },\n \"right\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"right\",\n \"space\": 0\n },\n \"insideH\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideH\",\n \"space\": 0\n },\n \"insideV\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideV\",\n \"space\": 0\n }\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n },\n {\n \"styleId\": \"a1\",\n \"name\": \"Normal Table\",\n \"styleType\": \"table\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": null,\n \"left\": null,\n \"bottom\": null,\n \"right\": null,\n \"insideH\": null,\n \"insideV\": null\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n },\n {\n \"styleId\": \"a2\",\n \"name\": \"No List\",\n \"styleType\": \"numbering\",\n \"runProperty\": {},\n \"paragraphProperty\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"tableProperty\": {\n \"width\": {\n \"width\": 0,\n \"widthType\": \"auto\"\n },\n \"justification\": \"left\",\n \"borders\": {\n \"top\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"top\",\n \"space\": 0\n },\n \"left\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"left\",\n \"space\": 0\n },\n \"bottom\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"bottom\",\n \"space\": 0\n },\n \"right\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"right\",\n \"space\": 0\n },\n \"insideH\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideH\",\n \"space\": 0\n },\n \"insideV\": {\n \"borderType\": \"single\",\n \"size\": 2,\n \"color\": \"000000\",\n \"position\": \"insideV\",\n \"space\": 0\n }\n },\n \"margins\": {\n \"top\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"left\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n },\n \"bottom\": {\n \"val\": 0,\n \"widthType\": \"dxa\"\n },\n \"right\": {\n \"val\": 55,\n \"widthType\": \"dxa\"\n }\n },\n \"indent\": null,\n \"style\": null,\n \"layout\": null\n },\n \"tableCellProperty\": {\n \"width\": null,\n \"borders\": null,\n \"gridSpan\": null,\n \"verticalMerge\": null,\n \"verticalAlign\": null,\n \"textDirection\": null,\n \"shading\": null\n },\n \"basedOn\": null\n }\n ]\n },\n \"document\": {\n \"children\": [\n {\n \"type\": \"paragraph\",\n \"data\": {\n \"id\": \"00000001\",\n \"children\": [\n {\n \"type\": \"run\",\n \"data\": {\n \"runProperty\": {},\n \"children\": [\n {\n \"type\": \"drawing\",\n \"data\": {}\n }\n ]\n }\n }\n ],\n \"property\": {\n \"runProperty\": {},\n \"tabs\": []\n },\n \"hasNumbering\": false\n }\n }\n ],\n \"sectionProperty\": {\n \"pageSize\": {\n \"w\": 11900,\n \"h\": 16840,\n \"orient\": null\n },\n \"pageMargin\": {\n \"top\": 1985,\n \"left\": 1701,\n \"bottom\": 1701,\n \"right\": 1701,\n \"header\": 851,\n \"footer\": 992,\n \"gutter\": 0\n },\n \"columns\": 425,\n \"titlePg\": false,\n \"docGrid\": {\n \"gridType\": \"lines\",\n \"linePitch\": 360,\n \"charSpace\": null\n }\n },\n \"hasNumbering\": false\n },\n \"comments\": {\n \"comments\": []\n },\n \"numberings\": {\n \"abstractNums\": [],\n \"numberings\": []\n },\n \"settings\": {\n \"defaultTabStop\": 840,\n \"zoom\": 100,\n \"docId\": \"C11ED300-8EA6-3D41-8D67-5E5DE3410CF8\",\n \"docVars\": [],\n \"evenAndOddHeaders\": false\n },\n \"fontTable\": {},\n \"media\": [],\n \"commentsExtended\": {\n \"children\": []\n },\n \"webSettings\": {\n \"divs\": []\n },\n \"taskpanes\": null,\n \"taskpanesRels\": {\n \"rels\": []\n },\n \"webExtensions\": [],\n \"customItems\": [],\n \"customItemProps\": [],\n \"customItemRels\": [],\n \"themes\": [\n {\n \"fontSchema\": {\n \"majorFont\": {\n \"latin\": \"游ゴシック Light\",\n \"ea\": \"\",\n \"cs\": \"\",\n \"fonts\": [\n {\n \"script\": \"Jpan\",\n \"typeface\": \"游ゴシック Light\"\n },\n {\n \"script\": \"Hang\",\n \"typeface\": \"맑은 고딕\"\n },\n {\n \"script\": \"Hans\",\n \"typeface\": \"等线 Light\"\n },\n {\n \"script\": \"Hant\",\n \"typeface\": \"新細明體\"\n },\n {\n \"script\": \"Arab\",\n \"typeface\": \"Times New Roman\"\n },\n {\n \"script\": \"Hebr\",\n \"typeface\": \"Times New Roman\"\n },\n {\n \"script\": \"Thai\",\n \"typeface\": \"Angsana New\"\n },\n {\n \"script\": \"Ethi\",\n \"typeface\": \"Nyala\"\n },\n {\n \"script\": \"Beng\",\n \"typeface\": \"Vrinda\"\n },\n {\n \"script\": \"Gujr\",\n \"typeface\": \"Shruti\"\n },\n {\n \"script\": \"Khmr\",\n \"typeface\": \"MoolBoran\"\n },\n {\n \"script\": \"Knda\",\n \"typeface\": \"Tunga\"\n },\n {\n \"script\": \"Guru\",\n \"typeface\": \"Raavi\"\n },\n {\n \"script\": \"Cans\",\n \"typeface\": \"Euphemia\"\n },\n {\n \"script\": \"Cher\",\n \"typeface\": \"Plantagenet Cherokee\"\n },\n {\n \"script\": \"Yiii\",\n \"typeface\": \"Microsoft Yi Baiti\"\n },\n {\n \"script\": \"Tibt\",\n \"typeface\": \"Microsoft Himalaya\"\n },\n {\n \"script\": \"Thaa\",\n \"typeface\": \"MV Boli\"\n },\n {\n \"script\": \"Deva\",\n \"typeface\": \"Mangal\"\n },\n {\n \"script\": \"Telu\",\n \"typeface\": \"Gautami\"\n },\n {\n \"script\": \"Taml\",\n \"typeface\": \"Latha\"\n },\n {\n \"script\": \"Syrc\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Orya\",\n \"typeface\": \"Kalinga\"\n },\n {\n \"script\": \"Mlym\",\n \"typeface\": \"Kartika\"\n },\n {\n \"script\": \"Laoo\",\n \"typeface\": \"DokChampa\"\n },\n {\n \"script\": \"Sinh\",\n \"typeface\": \"Iskoola Pota\"\n },\n {\n \"script\": \"Mong\",\n \"typeface\": \"Mongolian Baiti\"\n },\n {\n \"script\": \"Viet\",\n \"typeface\": \"Times New Roman\"\n },\n {\n \"script\": \"Uigh\",\n \"typeface\": \"Microsoft Uighur\"\n },\n {\n \"script\": \"Geor\",\n \"typeface\": \"Sylfaen\"\n },\n {\n \"script\": \"Armn\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Bugi\",\n \"typeface\": \"Leelawadee UI\"\n },\n {\n \"script\": \"Bopo\",\n \"typeface\": \"Microsoft JhengHei\"\n },\n {\n \"script\": \"Java\",\n \"typeface\": \"Javanese Text\"\n },\n {\n \"script\": \"Lisu\",\n \"typeface\": \"Segoe UI\"\n },\n {\n \"script\": \"Mymr\",\n \"typeface\": \"Myanmar Text\"\n },\n {\n \"script\": \"Nkoo\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Olck\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Osma\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Phag\",\n \"typeface\": \"Phagspa\"\n },\n {\n \"script\": \"Syrn\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syrj\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syre\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Sora\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Tale\",\n \"typeface\": \"Microsoft Tai Le\"\n },\n {\n \"script\": \"Talu\",\n \"typeface\": \"Microsoft New Tai Lue\"\n },\n {\n \"script\": \"Tfng\",\n \"typeface\": \"Ebrima\"\n }\n ]\n },\n \"minorFont\": {\n \"latin\": \"游明朝\",\n \"ea\": \"\",\n \"cs\": \"\",\n \"fonts\": [\n {\n \"script\": \"Jpan\",\n \"typeface\": \"游明朝\"\n },\n {\n \"script\": \"Hang\",\n \"typeface\": \"맑은 고딕\"\n },\n {\n \"script\": \"Hans\",\n \"typeface\": \"等线\"\n },\n {\n \"script\": \"Hant\",\n \"typeface\": \"新細明體\"\n },\n {\n \"script\": \"Arab\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Hebr\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Thai\",\n \"typeface\": \"Cordia New\"\n },\n {\n \"script\": \"Ethi\",\n \"typeface\": \"Nyala\"\n },\n {\n \"script\": \"Beng\",\n \"typeface\": \"Vrinda\"\n },\n {\n \"script\": \"Gujr\",\n \"typeface\": \"Shruti\"\n },\n {\n \"script\": \"Khmr\",\n \"typeface\": \"DaunPenh\"\n },\n {\n \"script\": \"Knda\",\n \"typeface\": \"Tunga\"\n },\n {\n \"script\": \"Guru\",\n \"typeface\": \"Raavi\"\n },\n {\n \"script\": \"Cans\",\n \"typeface\": \"Euphemia\"\n },\n {\n \"script\": \"Cher\",\n \"typeface\": \"Plantagenet Cherokee\"\n },\n {\n \"script\": \"Yiii\",\n \"typeface\": \"Microsoft Yi Baiti\"\n },\n {\n \"script\": \"Tibt\",\n \"typeface\": \"Microsoft Himalaya\"\n },\n {\n \"script\": \"Thaa\",\n \"typeface\": \"MV Boli\"\n },\n {\n \"script\": \"Deva\",\n \"typeface\": \"Mangal\"\n },\n {\n \"script\": \"Telu\",\n \"typeface\": \"Gautami\"\n },\n {\n \"script\": \"Taml\",\n \"typeface\": \"Latha\"\n },\n {\n \"script\": \"Syrc\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Orya\",\n \"typeface\": \"Kalinga\"\n },\n {\n \"script\": \"Mlym\",\n \"typeface\": \"Kartika\"\n },\n {\n \"script\": \"Laoo\",\n \"typeface\": \"DokChampa\"\n },\n {\n \"script\": \"Sinh\",\n \"typeface\": \"Iskoola Pota\"\n },\n {\n \"script\": \"Mong\",\n \"typeface\": \"Mongolian Baiti\"\n },\n {\n \"script\": \"Viet\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Uigh\",\n \"typeface\": \"Microsoft Uighur\"\n },\n {\n \"script\": \"Geor\",\n \"typeface\": \"Sylfaen\"\n },\n {\n \"script\": \"Armn\",\n \"typeface\": \"Arial\"\n },\n {\n \"script\": \"Bugi\",\n \"typeface\": \"Leelawadee UI\"\n },\n {\n \"script\": \"Bopo\",\n \"typeface\": \"Microsoft JhengHei\"\n },\n {\n \"script\": \"Java\",\n \"typeface\": \"Javanese Text\"\n },\n {\n \"script\": \"Lisu\",\n \"typeface\": \"Segoe UI\"\n },\n {\n \"script\": \"Mymr\",\n \"typeface\": \"Myanmar Text\"\n },\n {\n \"script\": \"Nkoo\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Olck\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Osma\",\n \"typeface\": \"Ebrima\"\n },\n {\n \"script\": \"Phag\",\n \"typeface\": \"Phagspa\"\n },\n {\n \"script\": \"Syrn\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syrj\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Syre\",\n \"typeface\": \"Estrangelo Edessa\"\n },\n {\n \"script\": \"Sora\",\n \"typeface\": \"Nirmala UI\"\n },\n {\n \"script\": \"Tale\",\n \"typeface\": \"Microsoft Tai Le\"\n },\n {\n \"script\": \"Talu\",\n \"typeface\": \"Microsoft New Tai Lue\"\n },\n {\n \"script\": \"Tfng\",\n \"typeface\": \"Ebrima\"\n }\n ]\n }\n }\n }\n ],\n \"images\": []\n}" diff --git a/docx-wasm/js/json/bindings/DrawingPosition.ts b/docx-wasm/js/json/bindings/DrawingPosition.ts new file mode 100644 index 0000000..e54349d --- /dev/null +++ b/docx-wasm/js/json/bindings/DrawingPosition.ts @@ -0,0 +1,3 @@ +import type { PicAlign } from "./PicAlign"; + +export type DrawingPosition = { offset: number } | { align: PicAlign }; \ No newline at end of file diff --git a/docx-wasm/js/json/bindings/DrawingPositionType.ts b/docx-wasm/js/json/bindings/DrawingPositionType.ts new file mode 100644 index 0000000..9f02187 --- /dev/null +++ b/docx-wasm/js/json/bindings/DrawingPositionType.ts @@ -0,0 +1,2 @@ + +export type DrawingPositionType = "anchor" | "inline"; \ No newline at end of file diff --git a/docx-wasm/js/json/bindings/Pic.ts b/docx-wasm/js/json/bindings/Pic.ts new file mode 100644 index 0000000..3612e42 --- /dev/null +++ b/docx-wasm/js/json/bindings/Pic.ts @@ -0,0 +1,6 @@ +import type { DrawingPosition } from "./DrawingPosition"; +import type { DrawingPositionType } from "./DrawingPositionType"; +import type { RelativeFromHType } from "./RelativeFromHType"; +import type { RelativeFromVType } from "./RelativeFromVType"; + +export interface Pic { id: string, image: Array, size: [number, number], positionType: DrawingPositionType, simplePos: boolean, simplePosX: number, simplePosY: number, layoutInCell: boolean, relativeHeight: number, allowOverlap: boolean, positionH: DrawingPosition, positionV: DrawingPosition, relativeFromH: RelativeFromHType, relativeFromV: RelativeFromVType, distT: number, distB: number, distL: number, distR: number, } \ No newline at end of file diff --git a/docx-wasm/js/json/bindings/PicAlign.ts b/docx-wasm/js/json/bindings/PicAlign.ts new file mode 100644 index 0000000..39b141e --- /dev/null +++ b/docx-wasm/js/json/bindings/PicAlign.ts @@ -0,0 +1,2 @@ + +export type PicAlign = "left" | "right" | "bottom" | "top"; \ No newline at end of file diff --git a/docx-wasm/js/json/bindings/RelativeFromHType.ts b/docx-wasm/js/json/bindings/RelativeFromHType.ts new file mode 100644 index 0000000..f62a24b --- /dev/null +++ b/docx-wasm/js/json/bindings/RelativeFromHType.ts @@ -0,0 +1,2 @@ + +export type RelativeFromHType = "character" | "column" | "insideMargin" | "leftMargin" | "margin" | "outsizeMargin" | "page" | "rightMargin"; \ No newline at end of file diff --git a/docx-wasm/js/json/bindings/RelativeFromVType.ts b/docx-wasm/js/json/bindings/RelativeFromVType.ts new file mode 100644 index 0000000..4014c9c --- /dev/null +++ b/docx-wasm/js/json/bindings/RelativeFromVType.ts @@ -0,0 +1,2 @@ + +export type RelativeFromVType = "bottomMargin" | "insideMargin" | "line" | "margin" | "outsizeMargin" | "page" | "paragraph" | "topMargin"; \ No newline at end of file diff --git a/docx-wasm/js/json/drawing.ts b/docx-wasm/js/json/drawing.ts index fba538a..fd41930 100644 --- a/docx-wasm/js/json/drawing.ts +++ b/docx-wasm/js/json/drawing.ts @@ -3,12 +3,10 @@ import { TextBoxContentJSON } from "./textbox-content"; export type DrawingJSON = { type: "drawing"; data: { - children: DrawingChildJSON[]; + type: "pic"; }; }; -export type DrawingChildJSON = WpAnchorJSON; - export type WpAnchorJSON = { type: "anchor"; data: { diff --git a/docx-wasm/js/json/index.ts b/docx-wasm/js/json/index.ts index d9b7a3e..f6a21b1 100644 --- a/docx-wasm/js/json/index.ts +++ b/docx-wasm/js/json/index.ts @@ -47,6 +47,8 @@ export type DocxJSON = { webSettings: WebSettingsJSON; fontTable: {}; themes: ThemeJSON[]; + // base64 encoded iamges + images: string[]; }; export type SettingsJSON = { diff --git a/docx-wasm/package.json b/docx-wasm/package.json index 3ade67c..ce5c78f 100644 --- a/docx-wasm/package.json +++ b/docx-wasm/package.json @@ -1,6 +1,6 @@ { "name": "docx-wasm", - "version": "0.0.249", + "version": "0.0.250", "main": "dist/node/index.js", "browser": "dist/web/index.js", "author": "bokuweb ", diff --git a/docx-wasm/test/__snapshots__/index.test.js.snap b/docx-wasm/test/__snapshots__/index.test.js.snap index 35cd460..bef5bcd 100644 --- a/docx-wasm/test/__snapshots__/index.test.js.snap +++ b/docx-wasm/test/__snapshots__/index.test.js.snap @@ -11724,33 +11724,32 @@ Object { Object { "data": Object { "data": Object { - "pic": Object { - "allowOverlap": true, - "distB": 0, - "distL": 0, - "distR": 0, - "distT": 0, - "id": "rId4", - "layoutInCell": true, - "positionH": Object { - "offset": 0, - }, - "positionType": "inline", - "positionV": Object { - "offset": 0, - }, - "relativeFromH": "margin", - "relativeFromV": "margin", - "relativeHeight": 0, - "simplePos": false, - "simplePosX": 0, - "simplePosY": 0, - "size": Array [ - 1275711, - 1699947, - ], + "allowOverlap": true, + "distB": 0, + "distL": 0, + "distR": 0, + "distT": 0, + "id": "rId4", + "layoutInCell": true, + "positionH": Object { + "offset": 0, }, + "positionType": "inline", + "positionV": Object { + "offset": 0, + }, + "relativeFromH": "margin", + "relativeFromV": "margin", + "relativeHeight": 0, + "simplePos": false, + "simplePosX": 0, + "simplePosY": 0, + "size": Array [ + 1275711, + 1699947, + ], }, + "type": "pic", }, "type": "drawing", }, @@ -11794,33 +11793,32 @@ Object { Object { "data": Object { "data": Object { - "pic": Object { - "allowOverlap": true, - "distB": 0, - "distL": 114300, - "distR": 114300, - "distT": 0, - "id": "rId5", - "layoutInCell": true, - "positionH": Object { - "offset": 798195, - }, - "positionType": "anchor", - "positionV": Object { - "offset": 2510155, - }, - "relativeFromH": "margin", - "relativeFromV": "margin", - "relativeHeight": 251658240, - "simplePos": false, - "simplePosX": 798195, - "simplePosY": 2510155, - "size": Array [ - 1264920, - 1685925, - ], + "allowOverlap": true, + "distB": 0, + "distL": 114300, + "distR": 114300, + "distT": 0, + "id": "rId5", + "layoutInCell": true, + "positionH": Object { + "offset": 798195, }, + "positionType": "anchor", + "positionV": Object { + "offset": 2510155, + }, + "relativeFromH": "margin", + "relativeFromV": "margin", + "relativeHeight": 251658240, + "simplePos": false, + "simplePosX": 798195, + "simplePosY": 2510155, + "size": Array [ + 1264920, + 1685925, + ], }, + "type": "pic", }, "type": "drawing", },