docx-plus 0.1.2 → 0.1.3

package/dist/index.umd.js

@@ -12415,7 +12415,8 @@
 		NONE: 0,
 		SQUARE: 1,
 		TIGHT: 2,
-		TOP_AND_BOTTOM: 3
+		TOP_AND_BOTTOM: 3,
+		THROUGH: 4
 	};
 	/**
 	* Enumeration of text wrapping sides for floating drawings.
@@ -12530,10 +12531,101 @@
 	* @module
 	*/
 	/**
+	* Creates a default rectangular wrap polygon matching the image extent.
+	*
+	* Reference: http://officeopenxml.com/drwPicFloating-textWrap.php
+	*
+	* ## XSD Schema
+	* ```xml
+	* <xsd:complexType name="CT_WrapPath">
+	*   <xsd:sequence>
+	*     <xsd:element name="start" type="a:CT_Point2D" minOccurs="1" maxOccurs="1"/>
+	*     <xsd:element name="lineTo" type="a:CT_Point2D" minOccurs="2" maxOccurs="unbounded"/>
+	*   </xsd:sequence>
+	*   <xsd:attribute name="edited" type="xsd:boolean" use="optional"/>
+	* </xsd:complexType>
+	* ```
+	*/
+	const createWrapPolygon$1 = (cx, cy) => new BuilderElement({
+		attributes: { edited: {
+			key: "edited",
+			value: "0"
+		} },
+		children: [
+			new BuilderElement({
+				attributes: {
+					x: {
+						key: "x",
+						value: 0
+					},
+					y: {
+						key: "y",
+						value: 0
+					}
+				},
+				name: "wp:start"
+			}),
+			new BuilderElement({
+				attributes: {
+					x: {
+						key: "x",
+						value: cx
+					},
+					y: {
+						key: "y",
+						value: 0
+					}
+				},
+				name: "wp:lineTo"
+			}),
+			new BuilderElement({
+				attributes: {
+					x: {
+						key: "x",
+						value: cx
+					},
+					y: {
+						key: "y",
+						value: cy
+					}
+				},
+				name: "wp:lineTo"
+			}),
+			new BuilderElement({
+				attributes: {
+					x: {
+						key: "x",
+						value: 0
+					},
+					y: {
+						key: "y",
+						value: cy
+					}
+				},
+				name: "wp:lineTo"
+			}),
+			new BuilderElement({
+				attributes: {
+					x: {
+						key: "x",
+						value: 0
+					},
+					y: {
+						key: "y",
+						value: 0
+					}
+				},
+				name: "wp:lineTo"
+			})
+		],
+		name: "wp:wrapPolygon"
+	});
+	/**
 	* Creates tight text wrapping for a floating drawing.
 	*
 	* WrapTight causes text to wrap closely around the contours
 	* of the drawing rather than its rectangular bounding box.
+	* A default rectangular wrap polygon matching the image extent is generated.
 	*
 	* Reference: http://officeopenxml.com/drwPicFloating-textWrap.php
 	*
@@ -12541,7 +12633,7 @@
 	* ```xml
 	* <xsd:complexType name="CT_WrapTight">
 	*   <xsd:sequence>
-	*     <xsd:element name="wrapPolygon" type="CT_WrapPath"/>
+	*     <xsd:element name="wrapPolygon" type="CT_WrapPath" minOccurs="1" maxOccurs="1"/>
 	*   </xsd:sequence>
 	*   <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
 	*   <xsd:attribute name="distL" type="ST_WrapDistance"/>
@@ -12549,23 +12641,176 @@
 	* </xsd:complexType>
 	* ```
 	*/
-	const createWrapTight = (margins = {
+	const createWrapTight = (textWrapping, margins = {
 		bottom: 0,
+		left: 0,
+		right: 0,
 		top: 0
-	}) => new BuilderElement({
+	}, extent) => new BuilderElement({
 		attributes: {
-			distB: {
-				key: "distB",
-				value: margins.bottom
+			distL: {
+				key: "distL",
+				value: margins.left
 			},
-			distT: {
-				key: "distT",
-				value: margins.top
+			distR: {
+				key: "distR",
+				value: margins.right
+			},
+			wrapText: {
+				key: "wrapText",
+				value: textWrapping.side || TextWrappingSide.BOTH_SIDES
 			}
 		},
+		children: [createWrapPolygon$1(extent.x, extent.y)],
 		name: "wp:wrapTight"
 	});
 	//#endregion
+	//#region src/file/drawing/text-wrap/wrap-through.ts
+	/**
+	* Wrap Through module for DrawingML text wrapping.
+	*
+	* This module provides "through" text wrapping for floating drawings
+	* where text wraps through the image contours, filling any concave areas.
+	*
+	* Reference: http://officeopenxml.com/drwPicFloating-textWrap.php
+	*
+	* @module
+	*/
+	/**
+	* Creates a default rectangular wrap polygon matching the image extent.
+	*
+	* Reference: http://officeopenxml.com/drwPicFloating-textWrap.php
+	*
+	* ## XSD Schema
+	* ```xml
+	* <xsd:complexType name="CT_WrapPath">
+	*   <xsd:sequence>
+	*     <xsd:element name="start" type="a:CT_Point2D" minOccurs="1" maxOccurs="1"/>
+	*     <xsd:element name="lineTo" type="a:CT_Point2D" minOccurs="2" maxOccurs="unbounded"/>
+	*   </xsd:sequence>
+	*   <xsd:attribute name="edited" type="xsd:boolean" use="optional"/>
+	* </xsd:complexType>
+	* ```
+	*/
+	const createWrapPolygon = (cx, cy) => new BuilderElement({
+		attributes: { edited: {
+			key: "edited",
+			value: "0"
+		} },
+		children: [
+			new BuilderElement({
+				attributes: {
+					x: {
+						key: "x",
+						value: 0
+					},
+					y: {
+						key: "y",
+						value: 0
+					}
+				},
+				name: "wp:start"
+			}),
+			new BuilderElement({
+				attributes: {
+					x: {
+						key: "x",
+						value: cx
+					},
+					y: {
+						key: "y",
+						value: 0
+					}
+				},
+				name: "wp:lineTo"
+			}),
+			new BuilderElement({
+				attributes: {
+					x: {
+						key: "x",
+						value: cx
+					},
+					y: {
+						key: "y",
+						value: cy
+					}
+				},
+				name: "wp:lineTo"
+			}),
+			new BuilderElement({
+				attributes: {
+					x: {
+						key: "x",
+						value: 0
+					},
+					y: {
+						key: "y",
+						value: cy
+					}
+				},
+				name: "wp:lineTo"
+			}),
+			new BuilderElement({
+				attributes: {
+					x: {
+						key: "x",
+						value: 0
+					},
+					y: {
+						key: "y",
+						value: 0
+					}
+				},
+				name: "wp:lineTo"
+			})
+		],
+		name: "wp:wrapPolygon"
+	});
+	/**
+	* Creates "through" text wrapping for a floating drawing.
+	*
+	* WrapThrough is similar to WrapTight but allows text to wrap through
+	* the concave portions of the drawing shape (e.g., the inside of the letter "O").
+	* A default rectangular wrap polygon matching the image extent is generated.
+	*
+	* Reference: http://officeopenxml.com/drwPicFloating-textWrap.php
+	*
+	* ## XSD Schema
+	* ```xml
+	* <xsd:complexType name="CT_WrapThrough">
+	*   <xsd:sequence>
+	*     <xsd:element name="wrapPolygon" type="CT_WrapPath" minOccurs="1" maxOccurs="1"/>
+	*   </xsd:sequence>
+	*   <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
+	*   <xsd:attribute name="distL" type="ST_WrapDistance"/>
+	*   <xsd:attribute name="distR" type="ST_WrapDistance"/>
+	* </xsd:complexType>
+	* ```
+	*/
+	const createWrapThrough = (textWrapping, margins = {
+		bottom: 0,
+		left: 0,
+		right: 0,
+		top: 0
+	}, extent) => new BuilderElement({
+		attributes: {
+			distL: {
+				key: "distL",
+				value: margins.left
+			},
+			distR: {
+				key: "distR",
+				value: margins.right
+			},
+			wrapText: {
+				key: "wrapText",
+				value: textWrapping.side || TextWrappingSide.BOTH_SIDES
+			}
+		},
+		children: [createWrapPolygon(extent.x, extent.y)],
+		name: "wp:wrapThrough"
+	});
+	//#endregion
 	//#region src/file/drawing/text-wrap/wrap-top-and-bottom.ts
 	/**
 	* Wrap Top and Bottom module for DrawingML text wrapping.
@@ -13015,7 +13260,16 @@
 					this.root.push(createWrapSquare(drawingOptions.floating.wrap, drawingOptions.floating.margins));
 					break;
 				case TextWrappingType.TIGHT:
-					this.root.push(createWrapTight(drawingOptions.floating.margins));
+					this.root.push(createWrapTight(drawingOptions.floating.wrap, drawingOptions.floating.margins, {
+						x: transform.emus.x,
+						y: transform.emus.y
+					}));
+					break;
+				case TextWrappingType.THROUGH:
+					this.root.push(createWrapThrough(drawingOptions.floating.wrap, drawingOptions.floating.margins, {
+						x: transform.emus.x,
+						y: transform.emus.y
+					}));
 					break;
 				case TextWrappingType.TOP_AND_BOTTOM:
 					this.root.push(createWrapTopAndBottom(drawingOptions.floating.margins));
@@ -27918,6 +28172,7 @@
 	exports.createVerticalPosition = createVerticalPosition;
 	exports.createWrapNone = createWrapNone;
 	exports.createWrapSquare = createWrapSquare;
+	exports.createWrapThrough = createWrapThrough;
 	exports.createWrapTight = createWrapTight;
 	exports.createWrapTopAndBottom = createWrapTopAndBottom;
 	exports.dateTimeValue = dateTimeValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docx-plus",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Easily generate .docx files with JS/TS with a nice declarative API. Works for Node and on the Browser.",
   "keywords": [
     "clippy",