@shbernal/ts-pptx 3.0.0 → 3.2.0

package/dist/{text-120VFSDm.js → text-C4P9MNdf.js}

@@ -1,10 +1,10 @@
 import { n as warn, r as warnOnce } from "./diagnostics-DYQC7xLV.js";
-import { n as InvalidOptionError, o as UnsupportedFeatureError, r as MediaError, t as InternalError } from "./errors-DGE9zh3U.js";
-import { a as FIXED_PCT_PER_PERCENT, d as emuToInches, g as pixelsToEmu, i as EMU_PER_POINT, l as STANDARD_LAYOUTS, m as inchesToEmu, r as EMU_PER_INCH, s as PERCENT_SCALE, t as ANGLE_UNITS_PER_DEGREE, v as ptToHundredths } from "./units-B-JUKwCS.js";
-import { $ as connectorPresetFor, C as DEF_PRES_LAYOUT_NAME, D as DEF_TEXT_GLOW, E as DEF_SLIDE_MARGIN_IN, F as PIECHART_COLORS, G as PlaceholderType, I as REGEX_HEX_COLOR, K as SchemeColor, L as SLDNUMFLDID, M as LAYOUT_IDX_SERIES_BASE, N as LETTERS, O as DEF_TEXT_SHADOW, Q as asChartType, R as XML_DECL, S as DEF_PRES_LAYOUT, T as DEF_SHAPE_SHADOW, Z as VALID_SHAPE_PRESETS, _ as DEF_CELL_BORDER, a as lineWidthToEmu, b as DEF_CHART_GRIDLINE, c as resolveTableColWidthsEmu, d as AXIS_ID_CATEGORY_PRIMARY, et as isChartExType, f as AXIS_ID_CATEGORY_SECONDARY, g as BARCHART_COLORS, h as AXIS_ID_VALUE_SECONDARY, i as inch2Emu, k as IMG_BROKEN, l as transparencyToAlpha, m as AXIS_ID_VALUE_PRIMARY, n as convertRotationDegrees, o as marginToEmu, p as AXIS_ID_SERIES_PRIMARY, r as getSmartParseNumber, s as opacityToAlpha, t as convertArcAngle, u as valToPts, v as DEF_CELL_MARGIN_IN, x as DEF_FONT_COLOR, y as DEF_CHART_BORDER } from "./units-internal-CiFWZWk4.js";
-import { E as svgMarkupToDataUri, S as getImageSizeFromBase64, T as decodeBase64ToBytes, a as PRESET_MATERIALS, g as PACKAGE_REL_NS, h as OFFICE_REL, i as PRESET_LINE_DASHES, n as LIGHT_RIGS, r as LIGHT_RIG_DIRECTIONS, s as TEXT_HORZ_OVERFLOW, t as BEVEL_PRESETS, u as checkEnumOrWarn, x as fitSrcRectPercents } from "./st-enums-CgadEyPM.js";
-import { t as getSlidesForTableRows } from "./autopage-MxulehqQ.js";
-import { _ as parseFontMetrics, m as FontMetricsRegistry, n as measureText, r as computeTableLayout, t as applyMeasuredFit } from "./fit-DGSwMMNs.js";
+import { n as InvalidOptionError, o as UnsupportedFeatureError, r as MediaError, t as InternalError } from "./errors-Bvln0H-7.js";
+import { a as FIXED_PCT_PER_PERCENT, d as emuToInches, g as pixelsToEmu, i as EMU_PER_POINT, l as STANDARD_LAYOUTS, m as inchesToEmu, r as EMU_PER_INCH, s as PERCENT_SCALE, t as ANGLE_UNITS_PER_DEGREE, v as ptToHundredths } from "./units-C7QM1KgH.js";
+import { $ as connectorPresetFor, C as DEF_PRES_LAYOUT_NAME, D as DEF_TEXT_GLOW, E as DEF_SLIDE_MARGIN_IN, F as PIECHART_COLORS, G as PlaceholderType, I as REGEX_HEX_COLOR, K as SchemeColor, L as SLDNUMFLDID, M as LAYOUT_IDX_SERIES_BASE, N as LETTERS, O as DEF_TEXT_SHADOW, Q as asChartType, R as XML_DECL, S as DEF_PRES_LAYOUT, T as DEF_SHAPE_SHADOW, Z as VALID_SHAPE_PRESETS, _ as DEF_CELL_BORDER, a as lineWidthToEmu, b as DEF_CHART_GRIDLINE, c as resolveTableColWidthsEmu, d as AXIS_ID_CATEGORY_PRIMARY, et as isChartExType, f as AXIS_ID_CATEGORY_SECONDARY, g as BARCHART_COLORS, h as AXIS_ID_VALUE_SECONDARY, i as inch2Emu, k as IMG_BROKEN, l as transparencyToAlpha, m as AXIS_ID_VALUE_PRIMARY, n as convertRotationDegrees, o as marginToEmu, p as AXIS_ID_SERIES_PRIMARY, r as getSmartParseNumber, s as opacityToAlpha, t as convertArcAngle, u as valToPts, v as DEF_CELL_MARGIN_IN, x as DEF_FONT_COLOR, y as DEF_CHART_BORDER } from "./units-internal-CR8s8YQa.js";
+import { E as svgMarkupToDataUri, S as getImageSizeFromBase64, T as decodeBase64ToBytes, a as PRESET_MATERIALS, g as PACKAGE_REL_NS, h as OFFICE_REL, i as PRESET_LINE_DASHES, n as LIGHT_RIGS, r as LIGHT_RIG_DIRECTIONS, s as TEXT_HORZ_OVERFLOW, t as BEVEL_PRESETS, u as checkEnumOrWarn, x as fitSrcRectPercents } from "./st-enums-evQG2A7Z.js";
+import { t as getSlidesForTableRows } from "./autopage-QQyfRtoK.js";
+import { _ as parseFontMetrics, m as FontMetricsRegistry, n as measureText, r as computeTableLayout, t as applyMeasuredFit } from "./fit-DhMbQG5O.js";
 import { a as flattenEmbeddedFaces, i as FONT_REL_TYPE, n as FONT_DATA_CONTENT_TYPE, o as serializeEmbeddedFontLst, r as FONT_DATA_EXTENSION, t as EMBEDDED_FONT_SLOTS } from "./embedded-fonts-MaynAHa9.js";
 import { ZipWriter } from "./zip.js";
 //#region src/media/content-type.ts
@@ -2332,7 +2332,7 @@ function applyTableHeaderColumnSugar(tableRows, opt) {
 					options: {}
 				} : {
 					...cell,
-					options: { ...cell.options || {} }
+					options: { ...cell.options }
 				};
 				const colDef = cols ? cols[colCursor] : void 0;
 				colCursor += cellObj.options?.colspan || 1;
@@ -3205,6 +3205,12 @@ function genXmlColorSelection(props) {
 			internalElements += alphaFromTransparency(props.transparency);
 		}
 		switch (fillType) {
+			case "none":
+				outText += voidEl("a:noFill");
+				break;
+			case "inherit":
+				outText += "";
+				break;
 			case "solid":
 				outText += el("a:solidFill", null, raw(createColorElement(colorVal, internalElements)));
 				break;
@@ -4822,6 +4828,27 @@ function makeSurfaceScene(opts) {
 * {@link ./data-refs}.
 */
 /**
+* Whether a chart-area/plot-area `fill` says anything the fill dispatch can act on.
+*
+* `c:spPr` is `a:CT_ShapeProperties` — the same optional `EG_FillProperties` group the
+* shape path writes into — so gradient, pattern and an omitted fill child are all legal
+* here. The gate used to be `fill?.color`, which meant every spelling carrying no colour
+* (`gradient`, `pattern`, `image`, `inherit`) fell to the no-fill arm and did nothing.
+*
+* The gate cannot simply be `fill != null`. `normalizeChartOptions` defaults
+* `plotArea.fill` to `{}`, so every chart in existence arrives here with a fill object,
+* and a presence check would paint each one a default grey. The same is true of the one
+* input a caller can write by hand: `{ transparency: 50 }` alone is not a fill, since
+* there is no colour for the alpha to apply to. Both stay no-fill.
+*
+* A payload with no `type` (`{ gradient }`, `{ pattern }`) is likewise not stated, which
+* matches the shape path: only `line` infers its type from a bare `gradient`, fills have
+* always wanted `type: 'gradient'` spelled out.
+*/
+function isStatedFill(fill) {
+	return Boolean(fill?.color || fill?.type);
+}
+/**
 * Build the chartSpace/chart header: chartSpace open, title (or autoTitleDeleted),
 * optional 3D view, and the plotArea open with optional manual layout.
 */
@@ -4977,7 +5004,7 @@ function makeChartPlotAreaPropsXml(rel) {
 		strXml += "</c:dTable>";
 	}
 	strXml += "  <c:spPr>";
-	strXml += plotArea.fill?.color ? genXmlColorSelection(plotArea.fill) : "<a:noFill/>";
+	strXml += isStatedFill(plotArea.fill) ? genXmlColorSelection(plotArea.fill) : "<a:noFill/>";
 	strXml += plotArea.border ? `<a:ln w="${valToPts(resolveBorderWidth(plotArea.border, 1))}" cap="flat">${genXmlColorSelection({
 		color: plotArea.border.color ?? "363636",
 		transparency: plotArea.border.transparency
@@ -5076,7 +5103,7 @@ function makeXmlCharts(rel) {
 	if (rel.opts._type === "scatter") strXml += "<c:showDLblsOverMax val=\"1\"/>";
 	strXml += "</c:chart>";
 	strXml += "<c:spPr>";
-	strXml += chartArea.fill?.color ? genXmlColorSelection(chartArea.fill) : "<a:noFill/>";
+	strXml += isStatedFill(chartArea.fill) ? genXmlColorSelection(chartArea.fill) : "<a:noFill/>";
 	strXml += chartArea.border ? `<a:ln w="${valToPts(resolveBorderWidth(chartArea.border, 1))}" cap="flat">${genXmlColorSelection({
 		color: chartArea.border.color ?? "363636",
 		transparency: chartArea.border.transparency
@@ -5939,7 +5966,7 @@ function bakeSlideContent(slides, fontMetrics) {
 * This **mirrors** the allocation in `slideObjectToXml`, which hands out ids as it walks the tree.
 * A reference that must name an id *before* the walk reaches it — a connector's `<a:stCxn>`, an
 * animation's `<p:spTgt spid>` — cannot wait for that, so it resolves through this map instead.
-* The two must stay in step: `test/regression/group-shapes.test.js` parses the emitted `cNvPr` ids
+* The two must stay in step: `test/regression/shape/group-shapes.test.js` parses the emitted `cNvPr` ids
 * back out and asserts each reference points at the shape it names, so drift fails there.
 * @param slideObjects - the slide's top-level objects
 * @returns each object's `<p:cNvPr>` id, keyed by object identity, in id order
@@ -6393,6 +6420,28 @@ function clampCharSpacingSpc(charSpacingPts) {
 	if (clamped !== raw) warnOnce("text/char-spacing-out-of-range", `charSpacing ${charSpacingPts} is outside the valid range -4000..4000pt; using ${clamped / 100}.`);
 	return clamped;
 }
+/**
+* Clamp a paragraph's left margin (points) into ST_TextMargin (0..4032pt, i.e. 0..51206400 EMU);
+* returns EMU for `a:pPr/@marL`. The type is unsigned — a negative margin is not a narrower one,
+* it is a value PowerPoint reports as needing repair.
+*/
+function clampParaMarginEmu(marginPts) {
+	const raw = valToPts(marginPts);
+	const clamped = Math.min(51206400, Math.max(0, raw));
+	if (clamped !== raw) warnOnce("text/paragraph-margin-out-of-range", `paraMarginLeft ${marginPts} is outside the valid range 0-4032pt; using ${clamped / EMU_PER_POINT}.`);
+	return clamped;
+}
+/**
+* Clamp a first-line indent (points) into ST_TextIndent (-4032..4032pt); returns EMU for
+* `a:pPr/@indent`. Unlike the margin this one is signed: a negative indent is the hanging
+* indent every bulleted paragraph uses.
+*/
+function clampParaIndentEmu(indentPts) {
+	const raw = valToPts(indentPts);
+	const clamped = Math.min(51206400, Math.max(-51206400, raw));
+	if (clamped !== raw) warnOnce("text/paragraph-indent-out-of-range", `paraIndent ${indentPts} is outside the valid range -4032..4032pt; using ${clamped / EMU_PER_POINT}.`);
+	return clamped;
+}
 /** Clamp line spacing (points) into ST_TextSpacingPoint (0..1584pt); returns hundredths for `<a:spcPts val>`. */
 function clampLineSpacingPts(lineSpacingPts) {
 	const raw = ptToHundredths(lineSpacingPts);
@@ -6620,6 +6669,37 @@ const HLINK_TEXT_COLOR_EXT = el("a:extLst", null, raw(el("a:ext", { uri: "{A12FA
 	closePrefix: " "
 });
 /**
+* Whether a `bullet` value makes the paragraph DRAW a bullet (a glyph, a number or a picture).
+*
+* Two call sites downstream of the emitter act on "this paragraph has a bullet" rather than on
+* "this paragraph says something about its bullet", and both were plain truthiness tests until
+* `'inherit'` — a truthy string that draws nothing — joined the union. Left as truthiness they
+* would have broken the line grouping (every run starting its own paragraph) and eaten a real
+* leading `•` from text that emits no `a:buChar` to duplicate it.
+* @param {TextPropsOptions['bullet']} bullet - the option value
+* @return {boolean} true when bullet markup is emitted
+*/
+function emitsBulletMarkup(bullet) {
+	return !!bullet && bullet !== "inherit";
+}
+/**
+* One paragraph margin attribute's value in EMU, or `null` when the attribute is not written.
+*
+* Three inputs, because the option has three states and so does the attribute: an explicit
+* number is clamped and written, `'inherit'` writes nothing, and an absent option falls back to
+* whatever the `bullet` arm decided — which is also `null` for `bullet: 'inherit'`, the one arm
+* that states nothing on its own.
+* @param {number|'inherit'|undefined} option - `paraMarginLeft` / `paraIndent` as given
+* @param {number|null} fallbackEmu - the bullet arm's default, `null` for no attribute
+* @param {Function} clamp - the attribute's ST_* range clamp (points in, EMU out)
+* @return {number|null} the EMU value to write, or null to omit the attribute
+*/
+function resolveParagraphMargin(option, fallbackEmu, clamp) {
+	if (option === void 0) return fallbackEmu;
+	if (option === "inherit") return null;
+	return clamp(option);
+}
+/**
 * Generate XML Paragraph Properties
 * @param {SlideObject|TextProps} textObj - text object
 * @param {boolean} isDefault - array of default relations
@@ -6634,44 +6714,47 @@ function genXmlParagraphProperties(textObj, isDefault) {
 	let strXmlTabStops = "";
 	const tag = isDefault ? "a:lvl1pPr" : "a:pPr";
 	let bulletMarL = valToPts(27);
+	let defaultMarL = null;
+	let defaultIndent = null;
+	let indentBeforeMarL = false;
 	let paragraphPropXml = `<${tag}${opts.rtlMode ? " rtl=\"1\" " : ""}`;
-	if (opts.align) switch (opts.align) {
-		case "left":
-			paragraphPropXml += " algn=\"l\"";
-			break;
-		case "right":
-			paragraphPropXml += " algn=\"r\"";
-			break;
-		case "center":
-			paragraphPropXml += " algn=\"ctr\"";
-			break;
-		case "justify":
-			paragraphPropXml += " algn=\"just\"";
-			break;
-		default: paragraphPropXml += "";
-	}
-	if (opts.lineSpacing) strXmlLnSpc = el("a:lnSpc", null, raw(voidEl("a:spcPts", { val: clampLineSpacingPts(opts.lineSpacing) })));
-	else if (opts.lineSpacingMultiple) strXmlLnSpc = el("a:lnSpc", null, raw(voidEl("a:spcPct", { val: Math.round(opts.lineSpacingMultiple * PERCENT_SCALE) })));
-	if (opts.indentLevel && !isNaN(Number(opts.indentLevel)) && opts.indentLevel > 0) paragraphPropXml += ` lvl="${opts.indentLevel}"`;
-	if (opts.paraSpaceBefore && !isNaN(Number(opts.paraSpaceBefore)) && opts.paraSpaceBefore > 0) strXmlParaSpc += el("a:spcBef", null, raw(voidEl("a:spcPts", { val: ptToHundredths(opts.paraSpaceBefore) })));
-	if (opts.paraSpaceAfter && !isNaN(Number(opts.paraSpaceAfter)) && opts.paraSpaceAfter > 0) strXmlParaSpc += el("a:spcAft", null, raw(voidEl("a:spcPts", { val: ptToHundredths(opts.paraSpaceAfter) })));
-	if (typeof opts.bullet === "object") {
-		const bulletImage = opts.bullet.image;
-		const isPictureBullet = !!(bulletImage && (bulletImage.path || bulletImage.data));
-		if (opts.bullet?.indent) bulletMarL = valToPts(opts.bullet.indent);
-		if (opts.bullet.color && !isPictureBullet) strXmlBulletColor = el("a:buClr", null, raw(createColorElement(opts.bullet.color)));
-		let bulletSizePct;
-		if (opts.bullet.size !== void 0) {
-			const bulletSize = Number(opts.bullet.size);
-			if (isNaN(bulletSize) || bulletSize < 25 || bulletSize > 400) warn("bullet/size-out-of-range", "`bullet.size` must be a percentage between 25 and 400!");
-			else bulletSizePct = Math.round(bulletSize * FIXED_PCT_PER_PERCENT);
+	{
+		if (opts.align) switch (opts.align) {
+			case "left":
+				paragraphPropXml += " algn=\"l\"";
+				break;
+			case "right":
+				paragraphPropXml += " algn=\"r\"";
+				break;
+			case "center":
+				paragraphPropXml += " algn=\"ctr\"";
+				break;
+			case "justify":
+				paragraphPropXml += " algn=\"just\"";
+				break;
+			default: paragraphPropXml += "";
 		}
-		const strXmlBulletSize = bulletSizePct === void 0 ? "" : voidEl("a:buSzPct", { val: bulletSizePct });
-		const strXmlBulletFont = opts.bullet.fontFace ? voidEl("a:buFont", { typeface: opts.bullet.fontFace }) : "";
-		const bulletIndentAttrs = () => ` marL="${opts.indentLevel && opts.indentLevel > 0 ? bulletMarL + bulletMarL * opts.indentLevel : bulletMarL}" indent="-${bulletMarL}"`;
-		if (isPictureBullet) {
-			paragraphPropXml += bulletIndentAttrs();
-			if (opts.bullet._rId) {
+		if (opts.lineSpacing) strXmlLnSpc = el("a:lnSpc", null, raw(voidEl("a:spcPts", { val: clampLineSpacingPts(opts.lineSpacing) })));
+		else if (opts.lineSpacingMultiple) strXmlLnSpc = el("a:lnSpc", null, raw(voidEl("a:spcPct", { val: Math.round(opts.lineSpacingMultiple * PERCENT_SCALE) })));
+		if (opts.indentLevel && !isNaN(Number(opts.indentLevel)) && opts.indentLevel > 0) paragraphPropXml += ` lvl="${opts.indentLevel}"`;
+		if (opts.paraSpaceBefore && !isNaN(Number(opts.paraSpaceBefore)) && opts.paraSpaceBefore > 0) strXmlParaSpc += el("a:spcBef", null, raw(voidEl("a:spcPts", { val: ptToHundredths(opts.paraSpaceBefore) })));
+		if (opts.paraSpaceAfter && !isNaN(Number(opts.paraSpaceAfter)) && opts.paraSpaceAfter > 0) strXmlParaSpc += el("a:spcAft", null, raw(voidEl("a:spcPts", { val: ptToHundredths(opts.paraSpaceAfter) })));
+		if (typeof opts.bullet === "object") {
+			const bulletImage = opts.bullet.image;
+			const isPictureBullet = !!(bulletImage && (bulletImage.path || bulletImage.data));
+			if (opts.bullet?.indent) bulletMarL = valToPts(opts.bullet.indent);
+			defaultMarL = opts.indentLevel && opts.indentLevel > 0 ? bulletMarL + bulletMarL * opts.indentLevel : bulletMarL;
+			defaultIndent = -bulletMarL;
+			if (opts.bullet.color && !isPictureBullet) strXmlBulletColor = el("a:buClr", null, raw(createColorElement(opts.bullet.color)));
+			let bulletSizePct;
+			if (opts.bullet.size !== void 0) {
+				const bulletSize = Number(opts.bullet.size);
+				if (isNaN(bulletSize) || bulletSize < 25 || bulletSize > 400) warn("bullet/size-out-of-range", "`bullet.size` must be a percentage between 25 and 400!");
+				else bulletSizePct = Math.round(bulletSize * FIXED_PCT_PER_PERCENT);
+			}
+			const strXmlBulletSize = bulletSizePct === void 0 ? "" : voidEl("a:buSzPct", { val: bulletSizePct });
+			const strXmlBulletFont = opts.bullet.fontFace ? voidEl("a:buFont", { typeface: opts.bullet.fontFace }) : "";
+			if (isPictureBullet) if (opts.bullet._rId) {
 				const svgExt = opts.bullet._rIdSvg ? el("a:extLst", null, raw(el("a:ext", { uri: "{96DAC541-7B7A-43D3-8B79-37D633B846F1}" }, raw(voidEl("asvg:svgBlip", {
 					"xmlns:asvg": "http://schemas.microsoft.com/office/drawing/2016/SVG/main",
 					"r:embed": `rId${opts.bullet._rIdSvg}`
@@ -6681,38 +6764,41 @@ function genXmlParagraphProperties(textObj, isDefault) {
 				warn("bullet/image-embed-failed", "picture `bullet.image` could not be embedded; using a default bullet glyph");
 				strXmlBullet = strXmlBulletSize + strXmlBulletFont + buChar("&#x2022;");
 			}
-		} else if (opts.bullet.type && opts.bullet.type.toString().toLowerCase() === "number") {
-			paragraphPropXml += bulletIndentAttrs();
-			strXmlBullet = strXmlBulletSize + (strXmlBulletFont || voidEl("a:buFont", { typeface: "+mj-lt" })) + voidEl("a:buAutoNum", {
+			else if (opts.bullet.type && opts.bullet.type.toString().toLowerCase() === "number") strXmlBullet = strXmlBulletSize + (strXmlBulletFont || voidEl("a:buFont", { typeface: "+mj-lt" })) + voidEl("a:buAutoNum", {
 				type: opts.bullet.numberType || "arabicPeriod",
 				startAt: opts.bullet.numberStartAt || "1"
 			});
-		} else if (opts.bullet.characterCode) {
-			let bulletCode = `&#x${opts.bullet.characterCode};`;
-			if (!/^[0-9A-Fa-f]{4}$/.test(opts.bullet.characterCode)) {
-				warn("bullet/invalid-character-code", "`bullet.characterCode` should be a 4-digit unicode character (ex: 22AB)!");
-				bulletCode = "&#x2022;";
-			}
-			paragraphPropXml += bulletIndentAttrs();
-			strXmlBullet = strXmlBulletSize + strXmlBulletFont + buChar(bulletCode);
-		} else {
-			paragraphPropXml += bulletIndentAttrs();
-			strXmlBullet = strXmlBulletSize + strXmlBulletFont + buChar("&#x2022;");
+			else if (opts.bullet.characterCode) {
+				let bulletCode = `&#x${opts.bullet.characterCode};`;
+				if (!/^[0-9A-Fa-f]{4}$/.test(opts.bullet.characterCode)) {
+					warn("bullet/invalid-character-code", "`bullet.characterCode` should be a 4-digit unicode character (ex: 22AB)!");
+					bulletCode = "&#x2022;";
+				}
+				strXmlBullet = strXmlBulletSize + strXmlBulletFont + buChar(bulletCode);
+			} else strXmlBullet = strXmlBulletSize + strXmlBulletFont + buChar("&#x2022;");
+		} else if (opts.bullet === "inherit") {} else if (opts.bullet) {
+			defaultMarL = opts.indentLevel && opts.indentLevel > 0 ? bulletMarL + bulletMarL * opts.indentLevel : bulletMarL;
+			defaultIndent = -bulletMarL;
+			strXmlBullet = buChar("&#x2022;");
+		} else if (!opts.bullet) {
+			defaultMarL = 0;
+			defaultIndent = 0;
+			indentBeforeMarL = true;
+			strXmlBullet = voidEl("a:buNone");
 		}
-	} else if (opts.bullet) {
-		paragraphPropXml += ` marL="${opts.indentLevel && opts.indentLevel > 0 ? bulletMarL + bulletMarL * opts.indentLevel : bulletMarL}" indent="-${bulletMarL}"`;
-		strXmlBullet = buChar("&#x2022;");
-	} else if (!opts.bullet) {
-		paragraphPropXml += " indent=\"0\" marL=\"0\"";
-		strXmlBullet = voidEl("a:buNone");
-	}
-	if (opts.tabStops && Array.isArray(opts.tabStops)) strXmlTabStops = el("a:tabLst", null, raw(opts.tabStops.map((stop) => voidEl("a:tab", {
-		pos: inch2Emu(stop.position || 1),
-		algn: stop.alignment || "l"
-	})).join("")));
-	paragraphPropXml += ">" + strXmlLnSpc + strXmlParaSpc + strXmlBulletColor + strXmlBullet + strXmlTabStops;
-	if (isDefault) paragraphPropXml += genXmlTextRunProperties(opts, true);
-	paragraphPropXml += "</" + tag + ">";
+		const marLEmu = resolveParagraphMargin(opts.paraMarginLeft, defaultMarL, clampParaMarginEmu);
+		const indentEmu = resolveParagraphMargin(opts.paraIndent, defaultIndent, clampParaIndentEmu);
+		const marLAttr = marLEmu === null ? "" : ` marL="${marLEmu}"`;
+		const indentAttr = indentEmu === null ? "" : ` indent="${indentEmu}"`;
+		paragraphPropXml += indentBeforeMarL ? indentAttr + marLAttr : marLAttr + indentAttr;
+		if (opts.tabStops && Array.isArray(opts.tabStops)) strXmlTabStops = el("a:tabLst", null, raw(opts.tabStops.map((stop) => voidEl("a:tab", {
+			pos: inch2Emu(stop.position || 1),
+			algn: stop.alignment || "l"
+		})).join("")));
+		paragraphPropXml += ">" + strXmlLnSpc + strXmlParaSpc + strXmlBulletColor + strXmlBullet + strXmlTabStops;
+		if (isDefault) paragraphPropXml += genXmlTextRunProperties(opts, true);
+		paragraphPropXml += "</" + tag + ">";
+	}
 	return paragraphPropXml;
 }
 /**
@@ -6833,7 +6919,7 @@ function groupRunsIntoLines(arrTextObjects, opts) {
 				arrLines.push(arrTexts);
 				arrTexts = [];
 			}
-		} else if (arrTexts.length > 0 && textObj.options.bullet && arrTexts.length > 0) {
+		} else if (arrTexts.length > 0 && emitsBulletMarkup(textObj.options.bullet)) {
 			arrLines.push(arrTexts);
 			arrTexts = [];
 			textObj.options.breakLine = false;
@@ -6863,7 +6949,6 @@ function renderTextParagraphsXml(arrLines, slideObj, opts) {
 		}
 		let reqsClosingFontSize = false;
 		let paraXml = "";
-		let paragraphPropXml = `<a:pPr ${line[0]?.options?.rtlMode ? " rtl=\"1\" " : ""}`;
 		let paragraphPropEmitted = false;
 		line.forEach((textObj, idx) => {
 			textObj.options._lineIdx = idx;
@@ -6874,20 +6959,18 @@ function renderTextParagraphsXml(arrLines, slideObj, opts) {
 			textObj.options.indentLevel = textObj.options.indentLevel || opts.indentLevel;
 			textObj.options.paraSpaceBefore = textObj.options.paraSpaceBefore || opts.paraSpaceBefore;
 			textObj.options.paraSpaceAfter = textObj.options.paraSpaceAfter || opts.paraSpaceAfter;
+			textObj.options.paraMarginLeft = textObj.options.paraMarginLeft ?? opts.paraMarginLeft;
+			textObj.options.paraIndent = textObj.options.paraIndent ?? opts.paraIndent;
 			if (!paragraphPropEmitted) {
-				paragraphPropXml = genXmlParagraphProperties(textObj, false);
-				const cleaned = paragraphPropXml.replace("<a:pPr></a:pPr>", "");
-				if (cleaned) {
-					paraXml += cleaned;
-					paragraphPropEmitted = true;
-				}
+				paragraphPropEmitted = true;
+				paraXml += genXmlParagraphProperties(textObj, false).replace("<a:pPr></a:pPr>", "");
 			}
 			const textOptions = textObj.options;
 			Object.entries(opts).filter(([key]) => !(textObj.options.hyperlink && key === "color")).forEach(([key, val]) => {
 				if (key !== "bullet" && !textOptions[key]) textOptions[key] = val;
 			});
 			let _textRunObj = textObj;
-			if (idx === 0 && line[0]?.options.bullet && typeof textObj.text === "string") {
+			if (idx === 0 && emitsBulletMarkup(line[0]?.options.bullet) && typeof textObj.text === "string") {
 				const _stripped = textObj.text.replace(/^[\u2022\u25E6\u25AA\u25AB\u25CF\u25CB\u2023\u2043\u2219]\s*/, "");
 				if (_stripped !== textObj.text) _textRunObj = {
 					text: _stripped,
@@ -11005,7 +11088,7 @@ async function writePackage(source, props) {
 * the OfficeGen project (Copyright 2013 Ziv Barber). This project is likewise MIT; the full
 * license text is in `LICENSE` at the repository root.
 */
-const VERSION = "3.0.0";
+const VERSION = "3.2.0";
 function standardLayoutToPresLayout(layout) {
 	return {
 		name: layout.name,
@@ -11893,4 +11976,4 @@ function textRuns(runs) {
 //#endregion
 export { PresentationCore as i, textRuns as n, clipPath as r, textRun as t };
 
-//# sourceMappingURL=text-120VFSDm.js.map
+//# sourceMappingURL=text-C4P9MNdf.js.map