jspdf-md-renderer 3.5.0 → 4.0.0

package/dist/index.umd.js

@@ -55,6 +55,30 @@
 	}) : target, mod));
 	//#endregion
 	jspdf_autotable = __toESM(jspdf_autotable);
+	//#region src/enums/mdTokenType.ts
+	let MdTokenType = /* @__PURE__ */ function(MdTokenType) {
+		MdTokenType["Heading"] = "heading";
+		MdTokenType["Paragraph"] = "paragraph";
+		MdTokenType["List"] = "list";
+		MdTokenType["ListItem"] = "list_item";
+		MdTokenType["Blockquote"] = "blockquote";
+		MdTokenType["Code"] = "code";
+		MdTokenType["CodeSpan"] = "codespan";
+		MdTokenType["Table"] = "table";
+		MdTokenType["Html"] = "html";
+		MdTokenType["Hr"] = "hr";
+		MdTokenType["Image"] = "image";
+		MdTokenType["Link"] = "link";
+		MdTokenType["Strong"] = "strong";
+		MdTokenType["Em"] = "em";
+		MdTokenType["TableHeader"] = "table_header";
+		MdTokenType["TableCell"] = "table_cell";
+		MdTokenType["Raw"] = "raw";
+		MdTokenType["Text"] = "text";
+		MdTokenType["Br"] = "br";
+		return MdTokenType;
+	}({});
+	//#endregion
 	//#region src/parser/imageExtension.ts
 	/**
 	* Internal hash prefix used to encode image attributes in the URL fragment.
@@ -73,8 +97,12 @@
 	const IMAGE_WITH_ATTRS_REGEX = /(!\[[^\]]*\]\()([^)]+)(\))\s*\{([^}]+)\}/g;
 	/**
 	* Regex to extract individual key=value pairs from the attribute block.
+	* Supports:
+	* - Bare values: width=200
+	* - Quoted values: width="200.5" or width='200'
+	* - Decimal values: width=200.5
 	*/
-	const ATTR_PAIR_REGEX = /(\w+)\s*=\s*(\w+)/g;
+	const ATTR_PAIR_REGEX = /(\w+)\s*=\s*(?:"([^"]*)"|'([^']*)'|(\S+))/g;
 	/** Valid alignment values */
 	const VALID_ALIGNMENTS = [
 		"left",
@@ -101,17 +129,17 @@
 		let match;
 		while ((match = ATTR_PAIR_REGEX.exec(attrString)) !== null) {
 			const key = match[1].toLowerCase();
-			const value = match[2];
+			const value = (match[2] ?? match[3] ?? match[4] ?? "").trim();
 			switch (key) {
 				case "width":
 				case "w": {
-					const num = parseInt(value, 10);
+					const num = parseFloat(value);
 					if (!isNaN(num) && num > 0) attrs.width = num;
 					break;
 				}
 				case "height":
 				case "h": {
-					const num = parseInt(value, 10);
+					const num = parseFloat(value);
 					if (!isNaN(num) && num > 0) attrs.height = num;
 					break;
 				}
@@ -165,12 +193,12 @@
 			const [key, value] = pair.split("=");
 			switch (key) {
 				case "w": {
-					const num = parseInt(value, 10);
+					const num = parseFloat(value);
 					if (!isNaN(num) && num > 0) attrs.width = num;
 					break;
 				}
 				case "h": {
-					const num = parseInt(value, 10);
+					const num = parseFloat(value);
 					if (!isNaN(num) && num > 0) attrs.height = num;
 					break;
 				}
@@ -245,6 +273,8 @@
 		["list_item"]: (token) => ({
 			type: "list_item",
 			content: token.text,
+			task: token.task ?? false,
+			checked: token.checked ?? false,
 			items: token.tokens ? convertTokens(token.tokens) : []
 		}),
 		["code"]: (token) => ({
@@ -311,14 +341,39 @@
 			items: token.tokens ? convertTokens(token.tokens) : []
 		}),
 		["html"]: (token) => {
-			const rawHtml = String(token.raw ?? token.text ?? "").trim();
-			if (/^<br\s*\/?>$/i.test(rawHtml)) return {
+			const raw = String(token.raw ?? token.text ?? "").trim();
+			if (/^<br\s*\/?>$/i.test(raw)) return {
 				type: "br",
 				content: "\n"
 			};
+			const inlineTagMap = {
+				strong: "strong",
+				b: "strong",
+				em: "em",
+				i: "em"
+			};
+			const inlineMatch = raw.match(/^<(\w+)[^>]*>(.*?)<\/\1>$/is);
+			if (inlineMatch) {
+				const tag = inlineMatch[1].toLowerCase();
+				const innerText = inlineMatch[2];
+				const mappedType = inlineTagMap[tag];
+				if (mappedType) return {
+					type: mappedType,
+					content: innerText
+				};
+			}
+			if (/^<(s|del)[^>]*>(.*?)<\/(s|del)>$/is.test(raw)) return {
+				type: "raw",
+				content: raw.match(/>([^<]+)</)?.[1] ?? raw
+			};
+			const strippedText = raw.replace(/<[^>]+>/g, "").trim();
+			if (strippedText) return {
+				type: "raw",
+				content: strippedText
+			};
 			return {
 				type: "raw",
-				content: token.raw ?? token.text ?? ""
+				content: ""
 			};
 		},
 		["br"]: () => ({
@@ -327,42 +382,41 @@
 		})
 	};
 	//#endregion
-	//#region src/utils/doc-helpers.ts
-	const getCharHight = (doc) => {
-		return doc.getTextDimensions("H").h;
+	//#region src/utils/handlePageBreak.ts
+	const HandlePageBreaks = (doc, store) => {
+		if (typeof store.options.pageBreakHandler === "function") store.options.pageBreakHandler(doc);
+		else doc.addPage(store.options.page?.format, store.options.page?.orientation);
+		store.updateY(store.options.page.topmargin);
+		store.updateX(store.options.page.xpading);
 	};
-	const getCharWidth = (doc) => {
-		return doc.getTextDimensions("H").w;
+	/**
+	* Returns true if adding `height` to the current Y would exceed the page.
+	*/
+	const willOverflow = (store, height) => {
+		return store.Y + height > store.options.page.maxContentHeight;
 	};
-	//#endregion
-	//#region src/renderer/components/heading.ts
 	/**
-	* Renders heading elements.
+	* Checks if we will overflow, and if so, breaks the page first.
+	* Returns true if a page break was performed.
 	*/
-	const renderHeading = (doc, element, indent, store, parentElementRenderer) => {
-		const size = 6 - (element?.depth ?? 0) > 0 ? 6 - (element?.depth ?? 0) : 1;
-		doc.setFontSize(store.options.page.defaultFontSize + size);
-		if (element?.items && element?.items.length > 0) for (const item of element?.items ?? []) parentElementRenderer(item, indent, store, false);
-		else {
-			const charHeight = getCharHight(doc);
-			doc.text(element?.content ?? "", store.X + indent, store.Y, {
-				align: "left",
-				maxWidth: store.options.page.maxContentWidth - indent,
-				baseline: "top"
-			});
-			store.recordContentY(store.Y + charHeight);
-			store.updateY(getCharHight(doc), "add");
+	const breakIfOverflow = (doc, store, height) => {
+		if (willOverflow(store, height)) {
+			HandlePageBreaks(doc, store);
+			return true;
 		}
-		doc.setFontSize(store.options.page.defaultFontSize);
-		store.updateX(store.options.page.xpading, "set");
+		return false;
+	};
+	/**
+	* Ensures there is at least `minHeight` space remaining on the page.
+	* If not, breaks to next page.
+	*/
+	const ensureSpace = (doc, store, minHeight) => {
+		if (store.options.page.maxContentHeight - store.Y < minHeight) HandlePageBreaks(doc, store);
 	};
 	//#endregion
-	//#region src/utils/handlePageBreak.ts
-	const HandlePageBreaks = (doc, store) => {
-		if (typeof store.options.pageBreakHandler === "function") store.options.pageBreakHandler(doc);
-		else doc.addPage(store.options.page?.format, store.options.page?.orientation);
-		store.updateY(store.options.page.topmargin);
-		store.updateX(store.options.page.xpading);
+	//#region src/utils/doc-helpers.ts
+	const getCharHight = (doc) => {
+		return doc.getFontSize() / doc.internal.scaleFactor;
 	};
 	//#endregion
 	//#region src/utils/image-utils.ts
@@ -531,115 +585,127 @@
 		}
 	};
 	//#endregion
-	//#region src/utils/justifiedTextRenderer.ts
+	//#region src/layout/wordSplitter.ts
 	/**
-	* JustifiedTextRenderer - Renders mixed inline elements with proper alignment.
-	*
-	* Features:
-	* - Handles bold, italic, codespan, links mixed in paragraph
-	* - Proper word spacing distribution for justified alignment
-	* - Supports left, right, center, and justify alignments
-	* - Page break handling
-	* - Preserves link clickability
-	* - Codespan background rendering
+	* Maps a ParsedElement type string to a TextStyle.
 	*/
-	var JustifiedTextRenderer = class {
-		static getCodespanOptions(store) {
-			const opts = store.options.codespan ?? {};
-			return {
-				backgroundColor: opts.backgroundColor ?? "#EEEEEE",
-				padding: opts.padding ?? .5,
-				showBackground: opts.showBackground !== false,
-				fontSizeScale: opts.fontSizeScale ?? .9
-			};
+	const resolveStyle = (type, parentStyle) => {
+		switch (type) {
+			case "strong": return parentStyle === "italic" ? "bolditalic" : "bold";
+			case "em": return parentStyle === "bold" ? "bolditalic" : "italic";
+			case "codespan": return "codespan";
+			default: return parentStyle ?? "normal";
 		}
-		/**
-		* Apply font style to the jsPDF document.
-		*/
-		static applyStyle(doc, style, store) {
-			const currentFont = doc.getFont().fontName;
-			const currentFontSize = doc.getFontSize();
-			const getBoldFont = () => {
-				const boldName = store.options.font.bold?.name;
-				return boldName && boldName !== "" ? boldName : currentFont;
-			};
-			const getRegularFont = () => {
-				const regularName = store.options.font.regular?.name;
-				return regularName && regularName !== "" ? regularName : currentFont;
-			};
-			switch (style) {
-				case "bold":
-					doc.setFont(getBoldFont(), store.options.font.bold?.style || "bold");
-					break;
-				case "italic":
-					doc.setFont(getRegularFont(), "italic");
-					break;
-				case "bolditalic":
-					doc.setFont(getBoldFont(), "bolditalic");
-					break;
-				case "codespan":
-					const codeFont = store.options.font.code || {
-						name: "courier",
-						style: "normal"
-					};
-					doc.setFont(codeFont.name, codeFont.style);
-					doc.setFontSize(currentFontSize * this.getCodespanOptions(store).fontSizeScale);
-					break;
-				default:
-					doc.setFont(getRegularFont(), doc.getFont().fontStyle);
-					break;
-			}
-		}
-		/**
-		* Measure word width with a specific style applied.
-		* NOTE: jsPDF's getTextWidth() does NOT include charSpace in its calculation,
-		* so we must manually add it: effectiveWidth = getTextWidth(text) + (text.length * charSpace)
-		*/
-		static measureWordWidth(doc, text, style, store) {
-			const savedFont = doc.getFont();
-			const savedSize = doc.getFontSize();
-			this.applyStyle(doc, style, store);
-			const baseWidth = doc.getTextWidth(text);
-			const charSpace = doc.getCharSpace?.() ?? 0;
-			const effectiveWidth = baseWidth + text.length * charSpace;
-			doc.setFont(savedFont.fontName, savedFont.fontStyle);
-			doc.setFontSize(savedSize);
-			return effectiveWidth;
+	};
+	/**
+	* Measures the width of `text` rendered with `style`, including jsPDF charSpace.
+	*/
+	const measureStyledWidth = (doc, text, style, store) => {
+		const savedFont = doc.getFont();
+		const savedSize = doc.getFontSize();
+		applyStyleToDoc(doc, style, store);
+		const charSpace = doc.getCharSpace?.() ?? 0;
+		const width = doc.getTextWidth(text) + text.length * charSpace;
+		doc.setFont(savedFont.fontName, savedFont.fontStyle);
+		doc.setFontSize(savedSize);
+		return width;
+	};
+	/**
+	* Applies a TextStyle to the jsPDF document.
+	*/
+	const applyStyleToDoc = (doc, style, store) => {
+		const curFont = doc.getFont().fontName;
+		const curSize = doc.getFontSize();
+		const boldFont = store.options.font.bold?.name || curFont;
+		const regularFont = store.options.font.regular?.name || curFont;
+		const codeFont = store.options.font.code || {
+			name: "courier",
+			style: "normal"
+		};
+		switch (style) {
+			case "bold":
+				doc.setFont(boldFont, store.options.font.bold?.style || "bold");
+				break;
+			case "italic":
+				doc.setFont(regularFont, "italic");
+				break;
+			case "bolditalic":
+				doc.setFont(boldFont, "bolditalic");
+				break;
+			case "codespan":
+				doc.setFont(codeFont.name, codeFont.style);
+				doc.setFontSize(curSize * (store.options.codespan?.fontSizeScale ?? .88));
+				break;
+			default:
+				doc.setFont(regularFont, "normal");
+				break;
 		}
-		/**
-		* Extract style from element type string.
-		*/
-		static getStyleFromType(type, parentStyle) {
-			switch (type) {
-				case "strong":
-					if (parentStyle === "italic") return "bolditalic";
-					return "bold";
-				case "em":
-					if (parentStyle === "bold") return "bolditalic";
-					return "italic";
-				case "codespan": return "codespan";
-				default: return parentStyle || "normal";
+	};
+	/**
+	* Flattens a ParsedElement tree into a flat array of StyledWordInfo.
+	* This is the single source of truth for converting AST → layout words.
+	*/
+	const flattenToWords = (doc, elements, store, parentStyle = "normal", isLink = false, href) => {
+		const result = [];
+		for (const el of elements) {
+			const style = resolveStyle(el.type, parentStyle);
+			const elIsLink = el.type === "link" || isLink;
+			const elHref = el.href || href;
+			if (el.type === "br") {
+				result.push({
+					text: "",
+					width: 0,
+					style,
+					isBr: true
+				});
+				continue;
 			}
-		}
-		/**
-		* Flatten ParsedElement tree into an array of StyledWordInfo.
-		* Handles nested inline elements.
-		*/
-		static flattenToWords(doc, elements, store, parentStyle = "normal", isLink = false, href) {
-			const result = [];
-			for (const el of elements) {
-				const style = this.getStyleFromType(el.type, parentStyle);
-				const elIsLink = el.type === "link" || isLink;
-				const elHref = el.href || href;
-				if (el.items && el.items.length > 0) {
-					const nested = this.flattenToWords(doc, el.items, store, style, elIsLink, elHref);
-					result.push(...nested);
-				} else if (el.type === "image") {
-					const maxH = store.options.page.maxContentHeight - store.options.page.topmargin;
-					const { finalWidth, finalHeight } = calculateImageDimensions(doc, el, store.options.page.maxContentWidth - store.options.page.indent * 0, maxH, store.options.page.unit || "mm");
+			if (el.type === "image") {
+				const { finalWidth, finalHeight } = calculateImageDimensions(doc, el, store.options.page.maxContentWidth, store.options.page.maxContentHeight - store.options.page.topmargin, store.options.page.unit || "mm");
+				result.push({
+					text: "",
+					width: finalWidth,
+					style,
+					isLink: elIsLink,
+					href: elHref,
+					isImage: true,
+					imageElement: el,
+					imageHeight: finalHeight
+				});
+				continue;
+			}
+			if (el.items && el.items.length > 0) {
+				result.push(...flattenToWords(doc, el.items, store, style, elIsLink, elHref));
+				continue;
+			}
+			const text = el.content || el.text || "";
+			if (!text) continue;
+			if (/^\s/.test(text) && result.length > 0) result[result.length - 1].hasTrailingSpace = true;
+			if (style === "codespan") {
+				const trimmed = text.trim();
+				if (trimmed) result.push({
+					text: trimmed,
+					width: measureStyledWidth(doc, trimmed, style, store),
+					style,
+					isLink: elIsLink,
+					href: elHref,
+					linkColor: elIsLink ? store.options.link?.linkColor || [
+						0,
+						0,
+						255
+					] : void 0,
+					hasTrailingSpace: /\s$/.test(text)
+				});
+				continue;
+			}
+			const lines = text.split("\n");
+			for (let li = 0; li < lines.length; li++) {
+				const words = lines[li].trim().split(/[ \t\r\v\f]+/).filter(Boolean);
+				for (let wi = 0; wi < words.length; wi++) {
+					const isLastInLine = wi === words.length - 1;
 					result.push({
-						text: "",
-						width: finalWidth,
+						text: words[wi],
+						width: measureStyledWidth(doc, words[wi], style, store),
 						style,
 						isLink: elIsLink,
 						href: elHref,
@@ -648,302 +714,253 @@
 							0,
 							255
 						] : void 0,
-						isImage: true,
-						imageElement: el,
-						imageHeight: finalHeight
+						hasTrailingSpace: !isLastInLine || /[ \t]$/.test(lines[li])
 					});
-				} else if (el.type === "br") result.push({
+				}
+				if (li < lines.length - 1) result.push({
 					text: "",
 					width: 0,
 					style,
 					isBr: true
 				});
-				else {
-					const text = el.content || el.text || "";
-					if (!text) continue;
-					if (/^\s/.test(text) && result.length > 0) result[result.length - 1].hasTrailingSpace = true;
-					if (style === "codespan") {
-						const trimmedText = text.trim();
-						if (trimmedText) result.push({
-							text: trimmedText,
-							width: this.measureWordWidth(doc, trimmedText, style, store),
-							style,
-							isLink: elIsLink,
-							href: elHref,
-							linkColor: elIsLink ? store.options.link?.linkColor || [
-								0,
-								0,
-								255
-							] : void 0,
-							hasTrailingSpace: /\s$/.test(text)
-						});
-						continue;
-					}
-					const words = text.trim().split(/\s+/).filter((w) => w.length > 0);
-					for (let i = 0; i < words.length; i++) {
-						const hasTrailingSpace = !(i === words.length - 1) || /\s$/.test(text);
-						result.push({
-							text: words[i],
-							width: this.measureWordWidth(doc, words[i], style, store),
-							style,
-							isLink: elIsLink,
-							href: elHref,
-							linkColor: elIsLink ? store.options.link?.linkColor || [
-								0,
-								0,
-								255
-							] : void 0,
-							hasTrailingSpace
-						});
-					}
-				}
 			}
-			return result;
 		}
-		/**
-		* Break a flat list of words into lines that fit within maxWidth.
-		* Correctly tracks totalTextWidth (sum of word widths only) for justification.
-		*/
-		static breakIntoLines(doc, words, maxWidth, store) {
-			const lines = [];
-			let currentLine = [];
-			let currentTextWidth = 0;
-			let currentLineWidth = 0;
-			let currentLineHeight = getCharHight(doc) * store.options.page.defaultLineHeightFactor;
-			const spaceWidth = doc.getTextWidth(" ");
-			for (let i = 0; i < words.length; i++) {
-				const word = words[i];
-				const neededWidthWithSpace = currentLine[currentLine.length - 1]?.hasTrailingSpace ? spaceWidth + word.width : word.width;
-				const itemHeight = word.isImage && word.imageHeight ? word.imageHeight : getCharHight(doc) * store.options.page.defaultLineHeightFactor;
-				if (word.isBr) {
-					lines.push({
-						words: currentLine,
-						totalTextWidth: currentTextWidth,
-						isLastLine: true,
-						lineHeight: currentLineHeight
-					});
-					currentLine = [];
-					currentTextWidth = 0;
-					currentLineWidth = 0;
-					currentLineHeight = getCharHight(doc) * store.options.page.defaultLineHeightFactor;
-					continue;
-				}
-				if (currentLineWidth + neededWidthWithSpace > maxWidth && currentLine.length > 0) {
-					lines.push({
-						words: currentLine,
-						totalTextWidth: currentTextWidth,
-						isLastLine: false,
-						lineHeight: currentLineHeight
-					});
-					currentLine = [word];
-					currentTextWidth = word.width;
-					currentLineWidth = word.width;
-					currentLineHeight = itemHeight;
-				} else {
-					currentLine.push(word);
-					currentTextWidth += word.width;
-					currentLineWidth += neededWidthWithSpace;
-					currentLineHeight = Math.max(currentLineHeight, itemHeight);
-				}
+		return result;
+	};
+	//#endregion
+	//#region src/layout/lineBreaker.ts
+	const splitOversizedWord = (doc, word, maxWidth, store) => {
+		if (!word.text || word.width <= maxWidth || word.isImage) return [word];
+		const chunks = [];
+		let remaining = word.text;
+		while (remaining.length > 0) {
+			let chunk = "";
+			for (const ch of remaining) {
+				const candidate = chunk + ch;
+				const candidateWidth = measureStyledWidth(doc, candidate, word.style, store);
+				if (candidateWidth > maxWidth && chunk.length > 0) break;
+				chunk = candidate;
+				if (candidateWidth >= maxWidth) break;
 			}
+			if (!chunk) chunk = remaining.charAt(0);
+			chunks.push({
+				...word,
+				text: chunk,
+				width: measureStyledWidth(doc, chunk, word.style, store),
+				hasTrailingSpace: false
+			});
+			remaining = remaining.slice(chunk.length);
+		}
+		if (chunks.length > 0) chunks[chunks.length - 1].hasTrailingSpace = word.hasTrailingSpace;
+		return chunks;
+	};
+	const breakIntoLines = (doc, words, maxWidth, store) => {
+		const normalizedWords = [];
+		for (const word of words) normalizedWords.push(...splitOversizedWord(doc, word, maxWidth, store));
+		const lines = [];
+		let currentLine = [];
+		let currentTextWidth = 0;
+		let currentLineWidth = 0;
+		const baseLineHeight = getCharHight(doc) * store.options.page.defaultLineHeightFactor;
+		let currentLineHeight = baseLineHeight;
+		const spaceWidth = doc.getTextWidth(" ");
+		const pushLine = (isLast) => {
 			if (currentLine.length > 0) lines.push({
 				words: currentLine,
 				totalTextWidth: currentTextWidth,
-				isLastLine: true,
+				isLastLine: isLast,
 				lineHeight: currentLineHeight
 			});
-			return lines;
-		}
-		/**
-		* Render a single word with its style applied.
-		*/
-		static renderWord(doc, word, x, y, store) {
-			const savedFont = doc.getFont();
-			const savedSize = doc.getFontSize();
-			const savedColor = doc.getTextColor();
-			this.applyStyle(doc, word.style, store);
-			if (word.isLink && word.linkColor) doc.setTextColor(...word.linkColor);
-			if (word.isImage && word.imageElement && word.imageElement.data) try {
-				let imgFormat = "JPEG";
-				if (word.imageElement.data.startsWith("data:image/png")) imgFormat = "PNG";
-				else if (word.imageElement.data.startsWith("data:image/webp")) imgFormat = "WEBP";
-				else if (word.imageElement.data.startsWith("data:image/gif")) imgFormat = "GIF";
-				else if (word.imageElement.src) {
-					const ext = word.imageElement.src.split("?")[0].split("#")[0].split(".").pop()?.toUpperCase();
-					if (ext && [
-						"PNG",
-						"JPEG",
-						"JPG",
-						"WEBP",
-						"GIF"
-					].includes(ext)) imgFormat = ext === "JPG" ? "JPEG" : ext;
-				}
-				if (word.width > 0 && (word.imageHeight || 0) > 0) {
-					const imgH = word.imageHeight || 0;
-					const imgY = y;
-					doc.addImage(word.imageElement.data, imgFormat, x, imgY, word.width, imgH);
-				}
-			} catch (e) {
-				console.warn("Failed to render inline image", e);
-			}
-			else {
-				if (word.style === "codespan") {
-					const codespanOpts = this.getCodespanOptions(store);
-					if (codespanOpts.showBackground) {
-						const h = getCharHight(doc);
-						const pad = codespanOpts.padding;
-						doc.setFillColor(codespanOpts.backgroundColor);
-						doc.rect(x - pad, y - pad, word.width + pad * 2, h + pad * 2, "F");
-						doc.setFillColor("#000000");
-					}
-				}
-				doc.text(word.text, x, y, { baseline: "top" });
+		};
+		for (const word of normalizedWords) {
+			if (word.isBr) {
+				pushLine(true);
+				currentLine = [];
+				currentTextWidth = 0;
+				currentLineWidth = 0;
+				currentLineHeight = baseLineHeight;
+				continue;
 			}
-			if (word.isLink && word.href) {
-				const h = word.isImage && word.imageHeight ? word.imageHeight : getCharHight(doc);
-				doc.link(x, y, word.width, h, { url: word.href });
+			const neededWidth = (currentLine[currentLine.length - 1]?.hasTrailingSpace ? spaceWidth : 0) + word.width;
+			const itemHeight = word.isImage && word.imageHeight ? word.imageHeight : baseLineHeight;
+			if (currentLineWidth + neededWidth > maxWidth && currentLine.length > 0) {
+				pushLine(false);
+				currentLine = [word];
+				currentTextWidth = word.width;
+				currentLineWidth = word.width;
+				currentLineHeight = itemHeight;
+			} else {
+				currentLine.push(word);
+				currentTextWidth += word.width;
+				currentLineWidth += neededWidth;
+				currentLineHeight = Math.max(currentLineHeight, itemHeight);
 			}
-			doc.setFont(savedFont.fontName, savedFont.fontStyle);
-			doc.setFontSize(savedSize);
-			doc.setTextColor(savedColor);
 		}
-		/**
-		* Render a single line with specified alignment.
-		*/
-		static renderAlignedLine(doc, line, x, y, maxWidth, store, alignment = "left") {
-			const { words, totalTextWidth, isLastLine } = line;
-			if (words.length === 0) return;
-			const normalSpaceWidth = doc.getTextWidth(" ");
-			let startX = x;
-			let wordSpacing = normalSpaceWidth;
-			let lineWidthWithNormalSpaces = totalTextWidth;
-			let expandableSpacesCount = 0;
-			for (let i = 0; i < words.length - 1; i++) if (words[i].hasTrailingSpace) {
-				lineWidthWithNormalSpaces += normalSpaceWidth;
-				expandableSpacesCount++;
-			}
-			switch (alignment) {
-				case "right":
-					startX = x + maxWidth - lineWidthWithNormalSpaces;
-					break;
-				case "center":
-					startX = x + (maxWidth - lineWidthWithNormalSpaces) / 2;
-					break;
-				case "justify":
-					if (!isLastLine && expandableSpacesCount > 0) wordSpacing = (maxWidth - totalTextWidth) / expandableSpacesCount;
-					break;
-				default: break;
-			}
-			let currentX = startX;
-			const textHeight = getCharHight(doc) * store.options.page.defaultLineHeightFactor;
-			for (let i = 0; i < words.length; i++) {
-				const word = words[i];
-				let drawY = y;
-				const elementHeight = word.isImage && word.imageHeight ? word.imageHeight : textHeight;
-				if (word.isImage) drawY = y;
-				else if (elementHeight < line.lineHeight) drawY = y + (line.lineHeight - elementHeight);
-				this.renderWord(doc, word, currentX, drawY, store);
-				currentX += word.width;
-				if (i < words.length - 1 && word.hasTrailingSpace) currentX += wordSpacing;
-			}
+		pushLine(true);
+		return lines;
+	};
+	//#endregion
+	//#region src/layout/lineRenderer.ts
+	const renderLine = (doc, line, x, y, maxWidth, store, alignment = "left") => {
+		const { words, totalTextWidth, isLastLine } = line;
+		if (words.length === 0) return;
+		const normalSpaceWidth = doc.getTextWidth(" ");
+		let lineWidthWithSpaces = totalTextWidth;
+		let expandableSpaces = 0;
+		for (let i = 0; i < words.length - 1; i++) if (words[i].hasTrailingSpace) {
+			lineWidthWithSpaces += normalSpaceWidth;
+			expandableSpaces++;
 		}
-		/**
-		* Main entry point: Render a paragraph with mixed inline elements.
-		* Respects user's textAlignment option from store.
-		*
-		* @param doc jsPDF instance
-		* @param elements Array of ParsedElement (inline items in a paragraph)
-		* @param x Starting X coordinate
-		* @param y Starting Y coordinate
-		* @param maxWidth Maximum width for text wrapping
-		* @param store RenderStore instance to use
-		* @param alignment Optional alignment override (defaults to store option)
-		*/
-		static renderStyledParagraph(doc, elements, x, y, maxWidth, store, alignment) {
-			const textAlignment = alignment ?? store.options.content?.textAlignment ?? "left";
-			const words = this.flattenToWords(doc, elements, store);
-			if (words.length === 0) return;
-			const lines = this.breakIntoLines(doc, words, maxWidth, store);
-			let currentY = y;
-			for (const line of lines) {
-				if (currentY + line.lineHeight > store.options.page.maxContentHeight) {
-					HandlePageBreaks(doc, store);
-					currentY = store.Y;
-				}
-				this.renderAlignedLine(doc, line, x, currentY, maxWidth, store, textAlignment);
-				store.recordContentY(currentY + line.lineHeight);
-				currentY += line.lineHeight;
-				store.updateY(line.lineHeight, "add");
-			}
-			const lastLine = lines[lines.length - 1];
-			if (lastLine) {
-				let actualSpacesCount = 0;
-				for (let i = 0; i < lastLine.words.length - 1; i++) if (lastLine.words[i].hasTrailingSpace) actualSpacesCount++;
-				const lastLineWidth = lastLine.totalTextWidth + actualSpacesCount * doc.getTextWidth(" ");
-				store.updateX(x + lastLineWidth, "set");
-			}
+		let startX = x;
+		let wordSpacing = normalSpaceWidth;
+		switch (alignment) {
+			case "right":
+				startX = x + maxWidth - lineWidthWithSpaces;
+				break;
+			case "center":
+				startX = x + (maxWidth - lineWidthWithSpaces) / 2;
+				break;
+			case "justify":
+				if (!isLastLine && expandableSpaces > 0) wordSpacing = (maxWidth - totalTextWidth) / expandableSpaces;
+				break;
 		}
-		/**
-		* @deprecated Use renderStyledParagraph instead
-		*/
-		static renderJustifiedParagraph(doc, elements, x, y, maxWidth, store) {
-			this.renderStyledParagraph(doc, elements, x, y, maxWidth, store);
+		const textLineHeight = getCharHight(doc) * store.options.page.defaultLineHeightFactor;
+		let currentX = startX;
+		for (let i = 0; i < words.length; i++) {
+			const word = words[i];
+			const elementHeight = word.isImage && word.imageHeight ? word.imageHeight : textLineHeight;
+			const drawY = word.isImage ? y : y + (line.lineHeight - elementHeight);
+			renderSingleWord(doc, word, currentX, drawY, store);
+			currentX += word.width;
+			if (i < words.length - 1 && word.hasTrailingSpace) currentX += wordSpacing;
 		}
 	};
+	const renderSingleWord = (doc, word, x, y, store) => {
+		const savedFont = doc.getFont();
+		const savedSize = doc.getFontSize();
+		const savedColor = doc.getTextColor();
+		applyStyleToDoc(doc, word.style, store);
+		if (word.isLink && word.linkColor) doc.setTextColor(...word.linkColor);
+		if (word.isImage && word.imageElement?.data) renderInlineImage(doc, word, x, y);
+		else {
+			if (word.style === "codespan") renderCodespanBackground(doc, word, x, y, store);
+			doc.text(word.text, x, y, { baseline: "top" });
+		}
+		if (word.isLink && word.href) {
+			const h = word.isImage && word.imageHeight ? word.imageHeight : doc.getTextDimensions("H").h;
+			doc.link(x, y, word.width, h, { url: word.href });
+		}
+		doc.setFont(savedFont.fontName, savedFont.fontStyle);
+		doc.setFontSize(savedSize);
+		doc.setTextColor(savedColor);
+	};
+	const renderCodespanBackground = (doc, word, x, y, store) => {
+		const opts = store.options.codespan ?? {};
+		if (opts.showBackground === false) return;
+		const bg = opts.backgroundColor ?? "#EEEEEE";
+		const pad = opts.padding ?? .8;
+		const h = doc.getTextDimensions("H").h;
+		doc.setFillColor(bg);
+		doc.rect(x - pad, y - pad, word.width + pad * 2, h + pad * 2, "F");
+		doc.setFillColor("#000000");
+	};
+	const renderInlineImage = (doc, word, x, y) => {
+		const el = word.imageElement;
+		let fmt = "JPEG";
+		if (el.data.startsWith("data:image/png")) fmt = "PNG";
+		else if (el.data.startsWith("data:image/webp")) fmt = "WEBP";
+		else if (el.data.startsWith("data:image/gif")) fmt = "GIF";
+		if (word.width > 0 && (word.imageHeight || 0) > 0) doc.addImage(el.data, fmt, x, y, word.width, word.imageHeight);
+	};
 	//#endregion
-	//#region src/utils/text-renderer.ts
-	var TextRenderer = class {
-		/**
-		* Renders text with automatic line wrapping and page breaking.
-		* @param doc jsPDF instance
-		* @param text Text to render
-		* @param store RenderStore instance to use
-		* @param x X coordinate (if not provided, uses store.X)
-		* @param y Y coordinate (if not provided, uses store.Y)
-		* @param maxWidth Max width for text wrapping
-		* @param justify Whether to justify the text
-		*/
-		static renderText(doc, text, store, x = store.X, y = store.Y, maxWidth, justify = false) {
-			const lines = doc.splitTextToSize(text, maxWidth);
-			const charHeight = getCharHight(doc);
-			const lineHeight = charHeight * store.options.page.defaultLineHeightFactor;
-			let currentY = y;
-			for (let i = 0; i < lines.length; i++) {
-				const line = lines[i];
-				if (currentY + lineHeight > store.options.page.maxContentHeight) {
-					HandlePageBreaks(doc, store);
-					currentY = store.Y;
-				}
-				if (justify) if (i === lines.length - 1) doc.text(line, x, currentY, { baseline: "top" });
-				else doc.text(line, x, currentY, {
-					maxWidth,
-					align: "justify",
-					baseline: "top"
-				});
-				else doc.text(line, x, currentY, { baseline: "top" });
-				store.recordContentY(currentY + charHeight);
-				currentY += lineHeight;
-				store.updateY(lineHeight, "add");
+	//#region src/layout/layoutEngine.ts
+	/**
+	* THE single entry point for rendering any mixed inline content.
+	* All paragraph, heading, list item, and blockquote text must go through here.
+	*
+	* Handles: word splitting, line breaking, page breaks, styled rendering.
+	* Returns the final Y position after rendering.
+	*/
+	const renderInlineContent = (doc, elements, x, y, maxWidth, store, opts = {}) => {
+		const alignment = opts.alignment ?? store.options.content?.textAlignment ?? "left";
+		const trimLastLine = opts.trimLastLine ?? false;
+		const words = flattenToWords(doc, elements, store);
+		if (words.length === 0) return y;
+		const lines = breakIntoLines(doc, words, maxWidth, store);
+		let currentY = y;
+		for (let i = 0; i < lines.length; i++) {
+			const line = lines[i];
+			if (currentY + line.lineHeight > store.options.page.maxContentHeight) {
+				HandlePageBreaks(doc, store);
+				currentY = store.Y;
 			}
-			return currentY;
+			renderLine(doc, line, x, currentY, maxWidth, store, alignment);
+			const yAdvance = i === lines.length - 1 && trimLastLine && !line.words.some((w) => w.isImage && w.imageHeight) ? getCharHight(doc) : line.lineHeight;
+			store.recordContentY(currentY + yAdvance);
+			currentY += yAdvance;
+			store.updateY(yAdvance, "add");
 		}
+		const lastLine = lines[lines.length - 1];
+		if (lastLine) {
+			let spaceCount = 0;
+			for (let i = 0; i < lastLine.words.length - 1; i++) if (lastLine.words[i].hasTrailingSpace) spaceCount++;
+			const lastLineW = lastLine.totalTextWidth + spaceCount * doc.getTextWidth(" ");
+			store.updateX(x + lastLineW, "set");
+		}
+		return currentY;
 	};
-	//#endregion
-	//#region src/renderer/components/paragraph.ts
 	/**
-	* Renders paragraph elements with proper text alignment.
-	* Handles mixed inline styles (bold, italic, codespan) and links.
-	* Respects user's textAlignment option from RenderStore.
+	* Render a single string of plain (unstyled) text with wrapping and page breaks.
+	* Use this for simple text in list items and raw items where there are no inline styles.
 	*/
+	const renderPlainText = (doc, text, x, y, maxWidth, store, opts = {}) => {
+		return renderInlineContent(doc, [{
+			type: "text",
+			content: text
+		}], x, y, maxWidth, store, opts);
+	};
+	//#endregion
+	//#region src/renderer/components/heading.ts
+	const renderHeading = (doc, element, indent, store) => {
+		const savedColor = doc.getTextColor();
+		const headingKey = `h${element?.depth ?? 1}`;
+		const fontSize = store.options.heading?.[headingKey] ?? store.options.page.defaultFontSize;
+		const headingColor = store.options.heading?.[`${headingKey}Color`] ?? store.options.heading?.color ?? "#000000";
+		const savedSize = doc.getFontSize();
+		doc.setFontSize(fontSize);
+		doc.setFont(store.options.font.bold.name, store.options.font.bold.style || "bold");
+		doc.setTextColor(headingColor);
+		breakIfOverflow(doc, store, getCharHight(doc) * 1.8);
+		const maxWidth = store.options.page.maxContentWidth - indent;
+		if (element.items && element.items.length > 0) renderInlineContent(doc, element.items, store.X + indent, store.Y, maxWidth, store, {
+			alignment: "left",
+			trimLastLine: true
+		});
+		else renderPlainText(doc, element?.content ?? "", store.X + indent, store.Y, maxWidth, store, {
+			alignment: "left",
+			trimLastLine: true
+		});
+		const bottomSpacing = store.options.heading?.bottomSpacing ?? store.options.spacing?.afterHeading ?? 2;
+		store.updateY(bottomSpacing, "add");
+		doc.setFontSize(savedSize);
+		doc.setFont(store.options.font.regular.name, store.options.font.regular.style);
+		doc.setTextColor(savedColor);
+		store.updateX(store.options.page.xpading, "set");
+	};
+	//#endregion
+	//#region src/renderer/components/paragraph.ts
 	const renderParagraph = (doc, element, indent, store, parentElementRenderer) => {
-		store.activateInlineLock();
+		const indentLevel = indent / store.options.page.indent;
+		const savedColor = doc.getTextColor();
 		doc.setFontSize(store.options.page.defaultFontSize);
+		doc.setFont(store.options.font.regular.name, store.options.font.regular.style);
+		doc.setTextColor(store.options.paragraph?.color ?? "#000000");
 		const maxWidth = store.options.page.maxContentWidth - indent;
-		if (element?.items && element?.items.length > 0) {
+		if (element.items && element.items.length > 0) {
 			if (element.items.length === 1 && element.items[0].type === "image") {
-				parentElementRenderer(element.items[0], indent, store, false);
+				parentElementRenderer(element.items[0], indentLevel, store, false);
 				store.updateX(store.options.page.xpading);
-				store.deactivateInlineLock();
+				doc.setTextColor(savedColor);
 				return;
 			}
 			const inlineTypes = [
@@ -957,35 +974,38 @@
 			];
 			if (element.items.some((item) => !inlineTypes.includes(item.type))) {
 				const inlineBuffer = [];
-				const flushInlineBuffer = () => {
+				const flush = () => {
 					if (inlineBuffer.length > 0) {
-						JustifiedTextRenderer.renderStyledParagraph(doc, inlineBuffer, store.X + indent, store.Y, maxWidth, store);
+						renderInlineContent(doc, inlineBuffer, store.X + indent, store.Y, maxWidth, store, { trimLastLine: true });
 						inlineBuffer.length = 0;
 					}
 				};
 				for (const item of element.items) if (inlineTypes.includes(item.type)) inlineBuffer.push(item);
 				else {
-					flushInlineBuffer();
-					parentElementRenderer(item, indent, store, false);
+					flush();
+					parentElementRenderer(item, indentLevel, store, false);
 				}
-				flushInlineBuffer();
-			} else JustifiedTextRenderer.renderStyledParagraph(doc, element.items, store.X + indent, store.Y, maxWidth, store);
-		} else {
-			const content = element.content ?? "";
-			const textAlignment = store.options.content?.textAlignment ?? "left";
-			if (content.trim()) TextRenderer.renderText(doc, content, store, store.X + indent, store.Y, maxWidth, textAlignment === "justify");
-		}
+				flush();
+			} else renderInlineContent(doc, element.items, store.X + indent, store.Y, maxWidth, store, { trimLastLine: true });
+		} else if (element.content?.trim()) renderInlineContent(doc, [{
+			type: "text",
+			content: element.content
+		}], store.X + indent, store.Y, maxWidth, store, { trimLastLine: true });
+		const bottomSpacing = store.options.paragraph?.bottomSpacing ?? store.options.spacing?.afterParagraph ?? store.options.page.lineSpace;
+		store.updateY(bottomSpacing, "add");
 		store.updateX(store.options.page.xpading);
-		store.deactivateInlineLock();
+		doc.setTextColor(savedColor);
 	};
 	//#endregion
 	//#region src/renderer/components/list.ts
 	const renderList = (doc, element, indentLevel, store, parentElementRenderer) => {
 		doc.setFontSize(store.options.page.defaultFontSize);
 		for (const [i, point] of element?.items?.entries() ?? []) {
-			const _start = element.ordered ? (element.start ?? 0) + i : element.start;
+			const _start = element.ordered ? (element.start ?? 1) + i : void 0;
 			parentElementRenderer(point, indentLevel + 1, store, true, _start, element.ordered);
+			if (i < (element.items?.length ?? 0) - 1) store.updateY(store.options.spacing?.betweenListItems ?? 0, "add");
 		}
+		store.updateY(store.options.spacing?.afterList ?? 3, "add");
 	};
 	//#endregion
 	//#region src/renderer/components/listItem.ts
@@ -993,22 +1013,46 @@
 	* Render a single list item, including bullets/numbering, inline text, and any nested lists.
 	*/
 	const renderListItem = (doc, element, indentLevel, store, parentElementRenderer, start, ordered) => {
-		if (store.Y + getCharHight(doc) >= store.options.page.maxContentHeight) HandlePageBreaks(doc, store);
+		breakIfOverflow(doc, store, getCharHight(doc));
 		const options = store.options;
-		const baseIndent = indentLevel * options.page.indent;
-		const bullet = ordered ? `${start}. ` : "• ";
+		const listOpts = store.options.list ?? {};
+		const baseIndent = indentLevel * (listOpts.indentSize ?? options.page.indent);
+		const bullet = ordered ? `${start}. ` : listOpts.bulletChar ?? "• ";
 		const xLeft = options.page.xpading;
 		store.updateX(xLeft, "set");
 		doc.setFont(options.font.regular.name, options.font.regular.style);
-		doc.text(bullet, xLeft + baseIndent, store.Y, { baseline: "top" });
-		const bulletWidth = doc.getTextWidth(bullet);
-		const contentX = xLeft + baseIndent + bulletWidth;
+		let contentX = xLeft + baseIndent;
+		let bulletWidth;
+		if (element.task) {
+			const cbSize = doc.getFontSize() * .5;
+			const cbX = xLeft + baseIndent;
+			const cbY = store.Y + (getCharHight(doc) - cbSize) / 2;
+			doc.setDrawColor("#555555");
+			doc.setLineWidth(.4);
+			doc.rect(cbX, cbY, cbSize, cbSize);
+			if (element.checked) {
+				doc.setDrawColor("#2B6CB0");
+				doc.setLineWidth(.5);
+				const pad = cbSize * .2;
+				doc.line(cbX + pad, cbY + cbSize * .55, cbX + cbSize * .4, cbY + cbSize - pad);
+				doc.line(cbX + cbSize * .4, cbY + cbSize - pad, cbX + cbSize - pad, cbY + pad);
+				doc.setDrawColor("#000000");
+			}
+			doc.setLineWidth(.1);
+			bulletWidth = cbSize + 2;
+		} else {
+			doc.text(bullet, xLeft + baseIndent, store.Y, { baseline: "top" });
+			bulletWidth = doc.getTextWidth(bullet);
+		}
+		contentX += bulletWidth;
 		const textMaxWidth = options.page.maxContentWidth - baseIndent - bulletWidth;
+		const originalTextColor = doc.getTextColor();
+		if (element.checked) doc.setTextColor(150, 150, 150);
 		if (element.items && element.items.length > 0) {
 			const inlineBuffer = [];
 			const flushInlineBuffer = () => {
 				if (inlineBuffer.length > 0) {
-					JustifiedTextRenderer.renderStyledParagraph(doc, inlineBuffer, contentX, store.Y, textMaxWidth, store);
+					renderInlineContent(doc, inlineBuffer, contentX, store.Y, textMaxWidth, store);
 					inlineBuffer.length = 0;
 					store.updateX(xLeft, "set");
 				}
@@ -1021,10 +1065,8 @@
 				parentElementRenderer(subItem, indentLevel, store, true, start, ordered);
 			} else inlineBuffer.push(subItem);
 			flushInlineBuffer();
-		} else if (element.content) {
-			const textAlignment = options.content?.textAlignment ?? "left";
-			TextRenderer.renderText(doc, element.content, store, contentX, store.Y, textMaxWidth, textAlignment === "justify");
-		}
+		} else if (element.content) renderPlainText(doc, element.content, contentX, store.Y, textMaxWidth, store);
+		doc.setTextColor(originalTextColor);
 	};
 	//#endregion
 	//#region src/renderer/components/rawItem.ts
@@ -1033,19 +1075,18 @@
 		else {
 			const options = store.options;
 			const indent = indentLevel * options.page.indent;
-			const bullet = hasRawBullet ? ordered ? `${start}. ` : "• " : "";
+			const listOpts = store.options.list ?? {};
+			const bullet = hasRawBullet ? ordered ? `${start}. ` : listOpts.bulletChar ?? "• " : "";
 			const content = element.content || "";
 			const xLeft = options.page.xpading;
 			if (!content && !bullet) return;
 			if (!content.trim() && !bullet) {
 				const newlines = (content.match(/\n/g) || []).length;
 				if (newlines > 1) {
-					const addedHeight = (newlines - 1) * (doc.getTextDimensions("A").h * options.page.defaultLineHeightFactor);
-					if (store.Y + addedHeight > options.page.maxContentHeight) HandlePageBreaks(doc, store);
-					else {
-						store.updateY(addedHeight, "add");
-						store.recordContentY(store.Y);
-					}
+					const addedHeight = (newlines - 1) * (getCharHight(doc) * options.page.defaultLineHeightFactor);
+					breakIfOverflow(doc, store, addedHeight);
+					store.updateY(addedHeight, "add");
+					store.recordContentY(store.Y);
 				}
 				return;
 			}
@@ -1055,10 +1096,10 @@
 				const textMaxWidth = options.page.maxContentWidth - indent - bulletWidth;
 				doc.setFont(options.font.regular.name, options.font.regular.style);
 				doc.text(bullet, xLeft + indent, store.Y, { baseline: "top" });
-				TextRenderer.renderText(doc, content, store, xLeft + indent + bulletWidth, store.Y, textMaxWidth, justify);
+				renderPlainText(doc, content, xLeft + indent + bulletWidth, store.Y, textMaxWidth, store, { alignment: justify ? "justify" : "left" });
 			} else {
 				const textMaxWidth = options.page.maxContentWidth - indent;
-				TextRenderer.renderText(doc, content, store, xLeft + indent, store.Y, textMaxWidth, justify);
+				renderPlainText(doc, content, xLeft + indent, store.Y, textMaxWidth, store, { alignment: justify ? "justify" : "left" });
 			}
 			store.updateX(xLeft, "set");
 		}
@@ -1066,6 +1107,9 @@
 	//#endregion
 	//#region src/renderer/components/hr.ts
 	const renderHR = (doc, store) => {
+		const savedDrawColor = doc.getDrawColor();
+		const savedLineWidth = doc.getLineWidth();
+		breakIfOverflow(doc, store, getCharHight(doc));
 		const pageWidth = doc.internal.pageSize.getWidth();
 		doc.setLineDashPattern([1, 1], 0);
 		doc.setLineWidth(.1);
@@ -1073,21 +1117,30 @@
 		doc.setLineWidth(.1);
 		doc.setLineDashPattern([], 0);
 		store.updateY(getCharHight(doc), "add");
+		store.updateY(store.options.spacing?.afterHR ?? 2, "add");
+		doc.setDrawColor(savedDrawColor);
+		doc.setLineWidth(savedLineWidth);
 	};
 	//#endregion
 	//#region src/renderer/components/code.ts
 	const renderCodeBlock = (doc, element, indentLevel, store) => {
 		const savedFont = doc.getFont();
 		const savedFontSize = doc.getFontSize();
+		const savedTextColor = doc.getTextColor();
+		const savedDrawColor = doc.getDrawColor();
+		const savedFillColor = doc.getFillColor();
 		const codeFont = store.options.font.code || {
 			name: "courier",
 			style: "normal"
 		};
 		doc.setFont(codeFont.name, codeFont.style);
-		const codeFontSize = store.options.page.defaultFontSize * .9;
+		const codeOpts = store.options.codeBlock ?? {};
+		const codeFontSizeScale = codeOpts.fontSizeScale ?? .9;
+		const codeFontSize = store.options.page.defaultFontSize * codeFontSizeScale;
 		doc.setFontSize(codeFontSize);
 		const indent = indentLevel * store.options.page.indent;
-		const maxWidth = store.options.page.maxContentWidth - indent - 8;
+		const padding = codeOpts.padding ?? 4;
+		const maxWidth = store.options.page.maxContentWidth - indent - padding * 2;
 		const lineHeightFactor = doc.getLineHeightFactor();
 		const lineHeight = codeFontSize / doc.internal.scaleFactor * lineHeightFactor;
 		const content = (element.code ?? "").replace(/[\r\n\s]+$/, "");
@@ -1103,9 +1156,9 @@
 			doc.setFontSize(savedFontSize);
 			return;
 		}
-		const padding = 4;
-		const bgColor = "#EEEEEE";
-		const drawColor = "#DDDDDD";
+		const bgColor = codeOpts.backgroundColor ?? "#F6F8FA";
+		const drawColor = codeOpts.borderColor ?? "#E1E4E8";
+		const radius = codeOpts.borderRadius ?? 2;
 		let currentLineIndex = 0;
 		while (currentLineIndex < lines.length) {
 			const availableHeight = store.options.page.maxContentHeight - store.Y;
@@ -1124,20 +1177,22 @@
 			if (isFirstChunk) store.updateY(padding, "add");
 			doc.setFillColor(bgColor);
 			doc.setDrawColor(drawColor);
-			doc.roundedRect(store.X, store.Y - padding, store.options.page.maxContentWidth, textBlockHeight + (isFirstChunk ? padding : 0) + (isLastChunk ? padding : 0), 2, 2, "FD");
-			if (isFirstChunk && element.lang) {
+			doc.roundedRect(store.X, store.Y - padding, store.options.page.maxContentWidth, textBlockHeight + (isFirstChunk ? padding : 0) + (isLastChunk ? padding : 0), radius, radius, "FD");
+			if (isFirstChunk && element.lang && codeOpts.showLanguageLabel !== false) {
 				const savedCodeFontSize = doc.getFontSize();
 				doc.setFontSize(10);
-				doc.setTextColor("#666666");
+				doc.setTextColor(codeOpts.labelColor ?? "#666666");
 				doc.text(element.lang, store.X + store.options.page.maxContentWidth - doc.getTextWidth(element.lang) - 4, store.Y, { baseline: "top" });
 				doc.setFontSize(savedCodeFontSize);
-				doc.setTextColor("#000000");
+				doc.setTextColor(savedTextColor);
 			}
 			let yPos = store.Y;
+			doc.setTextColor(codeOpts.textColor ?? "#000000");
 			for (const line of linesToRender) {
 				doc.text(line, store.X + 4, yPos, { baseline: "top" });
 				yPos += lineHeight;
 			}
+			doc.setTextColor(savedTextColor);
 			store.updateY(textBlockHeight, "add");
 			store.recordContentY(store.Y + (isLastChunk ? padding : 0));
 			if (isLastChunk) store.updateY(padding, "add");
@@ -1146,199 +1201,17 @@
 		}
 		doc.setFont(savedFont.fontName, savedFont.fontStyle);
 		doc.setFontSize(savedFontSize);
-	};
-	//#endregion
-	//#region src/renderer/components/inlineText.ts
-	/**
-	* Renders inline text elements (Strong, Em, and Text) with proper inline styling.
-	*/
-	const renderInlineText = (doc, element, indent, store) => {
-		const currentFont = doc.getFont().fontName;
-		const currentFontStyle = doc.getFont().fontStyle;
-		const currentFontSize = doc.getFontSize();
-		const spaceMultiplier = (style) => {
-			switch (style) {
-				case "normal": return 0;
-				case "bold": return 1;
-				case "italic": return 1.5;
-				case "bolditalic": return 1.5;
-				case "codespan": return .5;
-				default: return 0;
-			}
-		};
-		const renderTextWithStyle = (text, style) => {
-			if (style === "bold") doc.setFont(store.options.font.bold.name && store.options.font.bold.name !== "" ? store.options.font.bold.name : currentFont, store.options.font.bold.style || "bold");
-			else if (style === "italic") doc.setFont(store.options.font.regular.name, "italic");
-			else if (style === "bolditalic") doc.setFont(store.options.font.bold.name && store.options.font.bold.name !== "" ? store.options.font.bold.name : currentFont, "bolditalic");
-			else if (style === "codespan") {
-				const codeFont = store.options.font.code || {
-					name: "courier",
-					style: "normal"
-				};
-				doc.setFont(codeFont.name, codeFont.style);
-				doc.setFontSize(currentFontSize * .9);
-			} else doc.setFont(store.options.font.regular.name, currentFontStyle);
-			const availableWidth = store.options.page.maxContentWidth - indent - store.X;
-			const textLines = doc.splitTextToSize(text, availableWidth);
-			const isCodeSpan = style === "codespan";
-			const codePadding = 1;
-			const codeBgColor = "#EEEEEE";
-			if (store.isInlineLockActive) for (let i = 0; i < textLines.length; i++) {
-				if (isCodeSpan) {
-					const lineWidth = doc.getTextWidth(textLines[i]) + getCharWidth(doc);
-					const lineHeight = getCharHight(doc);
-					doc.setFillColor(codeBgColor);
-					doc.roundedRect(store.X + indent - codePadding, store.Y - codePadding, lineWidth + codePadding * 2, lineHeight + codePadding * 2, 2, 2, "F");
-					doc.setFillColor("#000000");
-				}
-				doc.text(textLines[i], store.X + indent, store.Y, {
-					baseline: "top",
-					maxWidth: availableWidth
-				});
-				store.updateX(doc.getTextDimensions(textLines[i]).w + (isCodeSpan ? codePadding * 2 : 1), "add");
-				if (i < textLines.length - 1) {
-					store.updateY(getCharHight(doc), "add");
-					store.updateX(store.options.page.xpading, "set");
-				}
-			}
-			else if (textLines.length > 1) {
-				const firstLine = textLines[0];
-				const restContent = textLines?.slice(1)?.join(" ");
-				if (isCodeSpan) {
-					const w = doc.getTextWidth(firstLine) + getCharWidth(doc);
-					const h = getCharHight(doc);
-					doc.setFillColor(codeBgColor);
-					doc.roundedRect(store.X + (indent >= 2 ? indent + 2 : 0) - codePadding, store.Y - codePadding, w + codePadding * 2, h + codePadding * 2, 2, 2, "F");
-					doc.setFillColor("#000000");
-				}
-				doc.text(firstLine, store.X + (indent >= 2 ? indent + 2 * spaceMultiplier(style) : 0), store.Y, {
-					baseline: "top",
-					maxWidth: availableWidth
-				});
-				store.updateX(store.options.page.xpading + indent);
-				store.updateY(getCharHight(doc), "add");
-				const maxWidthForRest = store.options.page.maxContentWidth - indent - store.options.page.xpading;
-				doc.splitTextToSize(restContent, maxWidthForRest).forEach((line) => {
-					if (isCodeSpan) {
-						const w = doc.getTextWidth(line) + getCharWidth(doc);
-						const h = getCharHight(doc);
-						doc.setFillColor(codeBgColor);
-						doc.roundedRect(store.X + getCharWidth(doc) - codePadding, store.Y - codePadding, w + codePadding * 2, h + codePadding * 2, 2, 2, "F");
-						doc.setFillColor("#000000");
-					}
-					doc.text(line, store.X + getCharWidth(doc), store.Y, {
-						baseline: "top",
-						maxWidth: maxWidthForRest
-					});
-				});
-			} else {
-				if (isCodeSpan) {
-					const w = doc.getTextWidth(text) + getCharWidth(doc);
-					const h = getCharHight(doc);
-					doc.setFillColor(codeBgColor);
-					doc.roundedRect(store.X + indent - codePadding, store.Y - codePadding, w + codePadding * 2, h + codePadding * 2, 2, 2, "F");
-					doc.setFillColor("#000000");
-				}
-				doc.text(text, store.X + indent, store.Y, {
-					baseline: "top",
-					maxWidth: availableWidth
-				});
-				store.updateX(doc.getTextDimensions(text).w + (indent >= 2 ? text.split(" ").length + 2 : 2) * spaceMultiplier(style) * .5 + (isCodeSpan ? codePadding * 2 : 0), "add");
-			}
-		};
-		if (element.type === "text" && element.items && element.items.length > 0) for (const item of element.items) if (item.type === "codespan") renderTextWithStyle(item.content || "", "codespan");
-		else if (item.type === "em" || item.type === "strong") {
-			const baseStyle = item.type === "em" ? "italic" : "bold";
-			if (item.items && item.items.length > 0) for (const subItem of item.items) if (subItem.type === "strong" && baseStyle === "italic") renderTextWithStyle(subItem.content || "", "bolditalic");
-			else if (subItem.type === "em" && baseStyle === "bold") renderTextWithStyle(subItem.content || "", "bolditalic");
-			else renderTextWithStyle(subItem.content || "", baseStyle);
-			else renderTextWithStyle(item.content || "", baseStyle);
-		} else renderTextWithStyle(item.content || "", "normal");
-		else if (element.type === "em") renderTextWithStyle(element.content || "", "italic");
-		else if (element.type === "strong") renderTextWithStyle(element.content || "", "bold");
-		else if (element.type === "codespan") renderTextWithStyle(element.content || "", "codespan");
-		else renderTextWithStyle(element.content || "", "normal");
-		doc.setFont(currentFont, currentFontStyle);
-		doc.setFontSize(currentFontSize);
-	};
-	//#endregion
-	//#region src/renderer/components/link.ts
-	/**
-	* Renders link elements with proper styling and URL handling.
-	* Links are rendered in blue color and underlined to distinguish them from regular text.
-	*/
-	const renderLink = (doc, element, indent, store) => {
-		const currentFont = doc.getFont().fontName;
-		const currentFontStyle = doc.getFont().fontStyle;
-		const currentFontSize = doc.getFontSize();
-		const currentTextColor = doc.getTextColor();
-		const linkColor = store.options.link?.linkColor || [
-			0,
-			0,
-			255
-		];
-		doc.setTextColor(...linkColor);
-		const availableWidth = store.options.page.maxContentWidth - indent - store.X;
-		const linkText = element.text || element.content || "";
-		const linkUrl = element.href || "";
-		const textLines = doc.splitTextToSize(linkText, availableWidth);
-		if (store.isInlineLockActive) for (let i = 0; i < textLines.length; i++) {
-			const textWidth = doc.getTextDimensions(textLines[i]).w;
-			const textHeight = getCharHight(doc) / 2;
-			doc.link(store.X + indent, store.Y, textWidth, textHeight, { url: linkUrl });
-			doc.text(textLines[i], store.X + indent, store.Y, {
-				baseline: "top",
-				maxWidth: availableWidth
-			});
-			store.updateX(textWidth + 1, "add");
-			if (store.X + textWidth > store.options.page.maxContentWidth - indent) {
-				store.updateY(textHeight, "add");
-				store.updateX(store.options.page.xpading + indent, "set");
-			}
-			if (i < textLines.length - 1) {
-				store.updateY(textHeight, "add");
-				store.updateX(store.options.page.xpading + indent, "set");
-			}
-		}
-		else if (textLines.length > 1) {
-			const firstLine = textLines[0];
-			const restContent = textLines?.slice(1)?.join(" ");
-			const firstLineWidth = doc.getTextDimensions(firstLine).w;
-			const textHeight = getCharHight(doc) / 2;
-			doc.link(store.X + indent, store.Y, firstLineWidth, textHeight, { url: linkUrl });
-			doc.text(firstLine, store.X + indent, store.Y, {
-				baseline: "top",
-				maxWidth: availableWidth
-			});
-			store.updateX(store.options.page.xpading + indent);
-			store.updateY(textHeight, "add");
-			const maxWidthForRest = store.options.page.maxContentWidth - indent - store.options.page.xpading;
-			doc.splitTextToSize(restContent, maxWidthForRest).forEach((line) => {
-				const lineWidth = doc.getTextDimensions(line).w;
-				doc.link(store.X + getCharWidth(doc), store.Y, lineWidth, textHeight, { url: linkUrl });
-				doc.text(line, store.X + getCharWidth(doc), store.Y, {
-					baseline: "top",
-					maxWidth: maxWidthForRest
-				});
-			});
-		} else {
-			const textWidth = doc.getTextDimensions(linkText).w;
-			const textHeight = getCharHight(doc) / 2;
-			doc.link(store.X + indent, store.Y, textWidth, textHeight, { url: linkUrl });
-			doc.text(linkText, store.X + indent, store.Y, {
-				baseline: "top",
-				maxWidth: availableWidth
-			});
-			store.updateX(textWidth + 2, "add");
-		}
-		doc.setFont(currentFont, currentFontStyle);
-		doc.setFontSize(currentFontSize);
-		doc.setTextColor(currentTextColor);
+		doc.setTextColor(savedTextColor);
+		doc.setDrawColor(savedDrawColor);
+		doc.setFillColor(savedFillColor);
+		store.updateY(store.options.spacing?.afterCodeBlock ?? 3, "add");
 	};
 	//#endregion
 	//#region src/renderer/components/blockquote.ts
 	const renderBlockquote = (doc, element, indentLevel, store, renderElement) => {
 		const options = store.options;
+		const savedDrawColor = doc.getDrawColor();
+		const savedLineWidth = doc.getLineWidth();
 		const blockquoteIndent = indentLevel + 1;
 		const currentX = store.X + indentLevel * options.page.indent;
 		const currentY = store.Y;
@@ -1348,10 +1221,13 @@
 		if (element.items && element.items.length > 0) element.items.forEach((item) => {
 			renderElement(item, blockquoteIndent, store);
 		});
-		const endY = store.Y;
+		const endY = store.lastContentY || store.Y;
 		const endPage = doc.internal.getCurrentPageInfo().pageNumber;
-		doc.setDrawColor(100);
-		doc.setLineWidth(1);
+		const bqOpts = store.options.blockquote ?? {};
+		const barColor = bqOpts.barColor ?? "#AAAAAA";
+		const barWidth = bqOpts.barWidth ?? 1;
+		doc.setDrawColor(barColor);
+		doc.setLineWidth(barWidth);
 		for (let p = startPage; p <= endPage; p++) {
 			doc.setPage(p);
 			const isStart = p === startPage;
@@ -1362,6 +1238,10 @@
 		}
 		store.recordContentY();
 		doc.setPage(endPage);
+		const bqBottomSpacing = bqOpts.bottomSpacing ?? options.spacing?.afterBlockquote ?? options.page.lineSpace;
+		store.updateY(bqBottomSpacing, "add");
+		doc.setDrawColor(savedDrawColor);
+		doc.setLineWidth(savedLineWidth);
 	};
 	//#endregion
 	//#region src/renderer/components/image.ts
@@ -1431,9 +1311,10 @@
 			const imgFormat = detectImageFormat(element);
 			if (finalWidth > 0 && finalHeight > 0) doc.addImage(element.data, imgFormat, drawX, currentY, finalWidth, finalHeight);
 			store.updateY(finalHeight, "add");
+			store.updateY(store.options.spacing?.afterImage ?? 2, "add");
 			store.recordContentY();
 		} catch (e) {
-			console.warn("Failed to render image", e);
+			console.warn("[jspdf-md-renderer] Failed to render image", e);
 		}
 	};
 	//#endregion
@@ -1446,34 +1327,56 @@
 		throw new Error("Could not resolve jspdf-autotable export. Expected a callable export.");
 	};
 	const renderTable = (doc, element, indentLevel, store) => {
-		if (!element.header || !element.rows) return;
+		if (!element.header || element.header.length === 0) {
+			console.warn("[jspdf-md-renderer] Table skipped: no header row");
+			return;
+		}
 		const options = store.options;
 		const marginLeft = options.page.xmargin + indentLevel * options.page.indent;
+		ensureSpace(doc, store, 20);
+		const columnCount = element.header.length;
+		const rows = (element.rows ?? []).map((row) => {
+			const normalized = [...row];
+			while (normalized.length < columnCount) normalized.push({
+				type: "table_cell",
+				content: ""
+			});
+			return normalized.slice(0, columnCount).map((cell) => cell.content || "");
+		});
 		const head = [element.header.map((h) => h.content || "")];
-		const body = element.rows.map((row) => row.map((cell) => cell.content || ""));
 		const userTableOptions = options.table || {};
+		const safeDidDrawPage = (data) => {
+			try {
+				if (userTableOptions.didDrawPage) userTableOptions.didDrawPage(data);
+			} catch (e) {
+				console.warn("[jspdf-md-renderer] table.didDrawPage callback threw:", e);
+			}
+		};
+		const safeDidDrawCell = (data) => {
+			try {
+				if (userTableOptions.didDrawCell) userTableOptions.didDrawCell(data);
+			} catch (e) {
+				console.warn("[jspdf-md-renderer] table.didDrawCell callback threw:", e);
+			}
+		};
 		resolveAutoTable()(doc, {
 			head,
-			body,
+			body: rows,
 			startY: store.Y,
 			margin: {
 				left: marginLeft,
 				right: options.page.xmargin
 			},
 			...userTableOptions,
-			didDrawPage: (data) => {
-				if (userTableOptions.didDrawPage) userTableOptions.didDrawPage(data);
-			},
-			didDrawCell: (data) => {
-				if (userTableOptions.didDrawCell) userTableOptions.didDrawCell(data);
-			}
+			didDrawPage: safeDidDrawPage,
+			didDrawCell: safeDidDrawCell
 		});
 		const finalY = doc.lastAutoTable?.finalY;
 		if (typeof finalY === "number") {
-			store.updateY(finalY + options.page.lineSpace, "set");
+			store.updateY(finalY + (options.spacing?.afterTable ?? 3), "set");
 			store.updateX(options.page.xpading, "set");
 			store.recordContentY();
-		}
+		} else console.warn("[jspdf-md-renderer] autoTable did not return a finalY. Y position may be incorrect.");
 	};
 	//#endregion
 	//#region src/store/renderStore.ts
@@ -1554,65 +1457,220 @@
 	};
 	//#endregion
 	//#region src/utils/options-validation.ts
-	const defaultOptions = {
-		page: {
-			indent: 10,
-			maxContentWidth: 190,
-			maxContentHeight: 277,
-			lineSpace: 1.5,
-			defaultLineHeightFactor: 1.2,
-			defaultFontSize: 12,
-			defaultTitleFontSize: 14,
-			topmargin: 10,
-			xpading: 10,
-			xmargin: 10,
-			format: "a4",
-			orientation: "p"
+	const DEFAULT_HEADING_SIZES = {
+		h1: 24,
+		h2: 20,
+		h3: 17,
+		h4: 15,
+		h5: 13,
+		h6: 12,
+		bottomSpacing: 2
+	};
+	const DEFAULT_FONT = {
+		bold: {
+			name: "helvetica",
+			style: "bold"
 		},
-		font: {
-			bold: {
-				name: "helvetica",
-				style: "bold"
-			},
-			regular: {
-				name: "helvetica",
-				style: "normal"
-			},
-			light: {
-				name: "helvetica",
-				style: "light"
-			},
-			code: {
-				name: "courier",
-				style: "normal"
-			}
+		regular: {
+			name: "helvetica",
+			style: "normal"
+		},
+		light: {
+			name: "helvetica",
+			style: "light"
 		},
-		image: { defaultAlign: "left" }
+		code: {
+			name: "courier",
+			style: "normal"
+		}
+	};
+	const DEFAULT_PAGE = {
+		format: "a4",
+		unit: "mm",
+		orientation: "portrait",
+		maxContentWidth: 190,
+		maxContentHeight: 277,
+		lineSpace: 3,
+		defaultLineHeightFactor: 1.4,
+		defaultFontSize: 11,
+		defaultTitleFontSize: 14,
+		topmargin: 10,
+		xpading: 10,
+		xmargin: 10,
+		indent: 8
 	};
 	const validateOptions = (options) => {
-		if (!options) throw new Error("RenderOption is required");
-		const mergedPage = {
-			...defaultOptions.page,
+		if (!options) throw new Error("[jspdf-md-renderer] RenderOption is required");
+		const page = {
+			...DEFAULT_PAGE,
 			...options.page
 		};
-		const mergedFont = {
-			...defaultOptions.font,
+		if (page.maxContentWidth <= 0) throw new Error("[jspdf-md-renderer] page.maxContentWidth must be > 0");
+		if (page.maxContentHeight <= 0) throw new Error("[jspdf-md-renderer] page.maxContentHeight must be > 0");
+		if (page.indent < 0) throw new Error("[jspdf-md-renderer] page.indent must be >= 0");
+		if (page.defaultFontSize < 1) throw new Error("[jspdf-md-renderer] page.defaultFontSize must be >= 1");
+		if (page.defaultLineHeightFactor < 1) page.defaultLineHeightFactor = 1.4;
+		if (!options.font?.regular?.name) throw new Error("[jspdf-md-renderer] font.regular.name is required");
+		const font = {
+			...DEFAULT_FONT,
 			...options.font
 		};
-		const mergedImage = {
-			...defaultOptions.image,
-			...options.image
+		if (!font.bold?.name) font.bold = DEFAULT_FONT.bold;
+		if (!font.code?.name) font.code = DEFAULT_FONT.code;
+		const heading = {
+			...DEFAULT_HEADING_SIZES,
+			...options.heading ?? {}
+		};
+		[
+			"h1",
+			"h2",
+			"h3",
+			"h4",
+			"h5",
+			"h6"
+		].forEach((k) => {
+			if (heading[k] < 6 || heading[k] > 72) heading[k] = DEFAULT_HEADING_SIZES[k];
+		});
+		const codespan = {
+			backgroundColor: "#EEEEEE",
+			padding: .8,
+			showBackground: true,
+			fontSizeScale: .88,
+			...options.codespan ?? {}
+		};
+		const blockquote = {
+			barColor: "#AAAAAA",
+			barWidth: 1,
+			paddingLeft: 4,
+			...options.blockquote ?? {}
+		};
+		const list = {
+			bulletChar: "• ",
+			indentSize: page.indent,
+			itemSpacing: 0,
+			...options.list ?? {}
+		};
+		const paragraph = {
+			bottomSpacing: page.lineSpace,
+			...options.paragraph ?? {}
+		};
+		const codeBlock = {
+			backgroundColor: "#F6F8FA",
+			borderColor: "#E1E4E8",
+			borderRadius: 2,
+			padding: 4,
+			fontSizeScale: .9,
+			showLanguageLabel: true,
+			...options.codeBlock ?? {}
 		};
-		if (!mergedPage.maxContentWidth) mergedPage.maxContentWidth = 190;
-		if (!mergedPage.maxContentHeight) mergedPage.maxContentHeight = 277;
+		const spacing = {
+			afterHeading: 2,
+			afterParagraph: 3,
+			afterCodeBlock: 3,
+			afterBlockquote: 3,
+			afterImage: 2,
+			afterHR: 2,
+			betweenListItems: 0,
+			afterList: 3,
+			afterTable: 3,
+			...options.spacing ?? {}
+		};
+		[
+			"afterHeading",
+			"afterParagraph",
+			"afterCodeBlock",
+			"afterBlockquote",
+			"afterImage",
+			"afterHR",
+			"betweenListItems",
+			"afterList",
+			"afterTable"
+		].forEach((key) => {
+			if ((spacing[key] ?? 0) < 0) spacing[key] = 0;
+		});
+		if ((heading.bottomSpacing ?? 0) < 0) heading.bottomSpacing = 0;
+		if ((paragraph.bottomSpacing ?? 0) < 0) paragraph.bottomSpacing = 0;
+		if ((blockquote.bottomSpacing ?? 0) < 0) blockquote.bottomSpacing = 0;
+		const image = {
+			defaultAlign: "left",
+			...options.image ?? {}
+		};
+		const endCursorYHandler = options.endCursorYHandler ?? (() => {});
 		return {
 			...options,
-			page: mergedPage,
-			font: mergedFont,
-			image: mergedImage
+			page,
+			font,
+			heading,
+			codespan,
+			blockquote,
+			list,
+			paragraph,
+			codeBlock,
+			spacing,
+			image,
+			endCursorYHandler
 		};
 	};
 	//#endregion
+	//#region src/utils/pageDecorations.ts
+	const applyPageDecorations = (doc, options) => {
+		const totalPages = doc.internal.getNumberOfPages();
+		for (let pageNum = 1; pageNum <= totalPages; pageNum++) {
+			doc.setPage(pageNum);
+			applyHeader(doc, options, pageNum, totalPages);
+			applyFooter(doc, options, pageNum, totalPages);
+		}
+	};
+	const applyHeader = (doc, options, pageNum, totalPages) => {
+		const hOpts = options.header;
+		if (!hOpts) return;
+		const text = typeof hOpts.text === "function" ? hOpts.text(pageNum, totalPages) : hOpts.text ?? "";
+		if (!text.trim()) return;
+		const savedFont = doc.getFont();
+		const savedSize = doc.getFontSize();
+		const savedColor = doc.getTextColor();
+		doc.setFontSize(hOpts.fontSize ?? 9);
+		doc.setTextColor(hOpts.color ?? "#666666");
+		const y = hOpts.y ?? 5;
+		const align = hOpts.align ?? "center";
+		const pageWidth = doc.internal.pageSize.getWidth();
+		let x = pageWidth / 2;
+		if (align === "left") x = options.page.xmargin;
+		if (align === "right") x = pageWidth - options.page.xmargin;
+		doc.text(text, x, y, {
+			align,
+			baseline: "top"
+		});
+		doc.setFont(savedFont.fontName, savedFont.fontStyle);
+		doc.setFontSize(savedSize);
+		doc.setTextColor(savedColor);
+	};
+	const applyFooter = (doc, options, pageNum, totalPages) => {
+		const fOpts = options.footer;
+		if (!fOpts) return;
+		const text = fOpts.showPageNumbers ? `Page ${pageNum} of ${totalPages}` : typeof fOpts.text === "function" ? fOpts.text(pageNum, totalPages) : fOpts.text ?? "";
+		if (!text.trim()) return;
+		const savedFont = doc.getFont();
+		const savedSize = doc.getFontSize();
+		const savedColor = doc.getTextColor();
+		doc.setFontSize(fOpts.fontSize ?? 9);
+		doc.setTextColor(fOpts.color ?? "#666666");
+		const pageHeight = doc.internal.pageSize.getHeight();
+		const y = fOpts.y ?? pageHeight - 5;
+		const align = fOpts.align ?? "right";
+		const pageWidth = doc.internal.pageSize.getWidth();
+		let x = pageWidth / 2;
+		if (align === "left") x = options.page.xmargin;
+		if (align === "right") x = pageWidth - options.page.xmargin;
+		doc.text(text, x, y, {
+			align,
+			baseline: "bottom"
+		});
+		doc.setFont(savedFont.fontName, savedFont.fontStyle);
+		doc.setFontSize(savedSize);
+		doc.setTextColor(savedColor);
+	};
+	//#endregion
 	//#region src/renderer/MdTextRender.ts
 	/**
 	* Renders parsed markdown text into jsPDF document.
@@ -1630,7 +1688,7 @@
 			const indent = indentLevel * validOptions.page.indent;
 			switch (element.type) {
 				case "heading":
-					renderHeading(doc, element, indent, store, renderElement);
+					renderHeading(doc, element, indent, store);
 					break;
 				case "paragraph":
 					renderParagraph(doc, element, indent, store, renderElement);
@@ -1650,10 +1708,8 @@
 				case "strong":
 				case "em":
 				case "codespan":
-					renderInlineText(doc, element, indent, store);
-					break;
 				case "link":
-					renderLink(doc, element, indent, store);
+					renderInlineContent(doc, [element], store.X + indent, store.Y, validOptions.page.maxContentWidth - indent, store);
 					break;
 				case "blockquote":
 					renderBlockquote(doc, element, indentLevel, store, renderElement);
@@ -1685,9 +1741,14 @@
 			}
 		};
 		for (const item of parsedElements) renderElement(item, 0, store);
+		applyPageDecorations(doc, validOptions);
 		validOptions.endCursorYHandler(store.Y);
 	};
 	//#endregion
 	exports.MdTextParser = MdTextParser;
 	exports.MdTextRender = MdTextRender;
+	exports.MdTokenType = MdTokenType;
+	exports.renderInlineContent = renderInlineContent;
+	exports.renderPlainText = renderPlainText;
+	exports.validateOptions = validateOptions;
 });