@makhmudov.kay/az-editor 0.1.0-beta.8 → 0.1.0-beta.9

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Изменения
 
+## 0.1.0-beta.9
+
+- E01: явные `strike=0`, `caps=0` и `vertAlign=baseline` у фрагмента сбрасывают унаследованное оформление. Подчёркивание и зачёркивание разрешаются независимо. Для `caps`/`strike` учитывается различие между переключателями стилей и прямым форматированием.
+- HTML-импорт сохраняет `text-decoration` в Chromium, где CSSOM раскрывает это свойство в longhand-свойства. Простое подчёркивание/зачёркивание больше не вызывает ложные предупреждения о потере стиля.
+- E02: группы абзацев с `page-break-inside:avoid` преобразуются в `keepLines` и связь `keepNext` внутри группы. Вложенные группы не захватывают соседние абзацы; принудительные разрывы страниц имеют приоритет.
+- Непредставимые группы с таблицами дают адресную диагностику `keep-group-not-representable` уровня `loss`. Строгий импорт отклоняется; принятие импорта не разрешает автоматически экспорт отредактированного документа с потерями.
+- Публичные методы и серверный HTML/JSON-контракт не изменены.
+
 ## 0.1.0-beta.8
 
 - HTML → DOCX сохраняет шрифт знака абзаца и наследуемый шрифт `<br>`. Обратный экспорт сохраняет семейство и размер знака абзаца отдельно от текста. Авторские пустые строки не удаляются.

package/dist/az-editor.js

@@ -582,12 +582,12 @@ async function G(e, t) {
 		}), r.resume();
 	})) : null;
 }
-function K(e) {
-	let t = {};
-	B(e, "vanish") && (t["--az-hidden"] = U(B(e, "vanish")) ? "1" : "0");
-	let n = B(e, "rFonts"), r = V(n, "ascii") || V(n, "hAnsi") || V(n, "cs");
-	r && (t["font-family"] = r), H(e, "sz") && (t["font-size"] = `${Number(H(e, "sz")) / 2}pt`);
-	for (let [n, r, i, a] of [[
+function K(e, t = {}) {
+	let n = { ...t };
+	B(e, "vanish") && (n["--az-hidden"] = U(B(e, "vanish")) ? "1" : "0");
+	let r = B(e, "rFonts"), i = V(r, "ascii") || V(r, "hAnsi") || V(r, "cs");
+	i && (n["font-family"] = i), H(e, "sz") && (n["font-size"] = `${Number(H(e, "sz")) / 2}pt`);
+	for (let [t, r, i, a] of [[
 		"b",
 		"font-weight",
 		"bold",
@@ -597,15 +597,55 @@ function K(e) {
 		"font-style",
 		"italic",
 		"normal"
-	]]) B(e, n) && (t[r] = U(B(e, n)) ? i : a);
-	let i = [];
-	B(e, "u") && (U(B(e, "u")) ? i.push("underline") : t["text-decoration"] = "none"), (U(B(e, "strike")) || U(B(e, "dstrike"))) && i.push("line-through"), i.length && (t["text-decoration"] = i.join(" "));
+	]]) B(e, t) && (n[r] = U(B(e, t)) ? i : a);
+	for (let t of [
+		"u",
+		"strike",
+		"dstrike"
+	]) {
+		let r = B(e, t);
+		r && (n[`--az-decoration-${t}`] = U(r) ? "1" : "0");
+	}
+	if ([
+		"u",
+		"strike",
+		"dstrike"
+	].some((e) => n[`--az-decoration-${e}`] !== void 0)) {
+		let e = [];
+		n["--az-decoration-u"] === "1" && e.push("underline"), (n["--az-decoration-strike"] === "1" || n["--az-decoration-dstrike"] === "1") && e.push("line-through"), n["text-decoration"] = e.join(" ") || "none";
+	}
 	let a = H(e, "color");
-	/^[\da-f]{6}$/i.test(a) && (t.color = `#${a}`);
+	/^[\da-f]{6}$/i.test(a) && (n.color = `#${a}`);
 	let o = V(B(e, "shd"), "fill");
-	return /^[\da-f]{6}$/i.test(o) ? t["background-color"] = `#${o}` : H(e, "highlight") && H(e, "highlight") !== "none" && (t["background-color"] = H(e, "highlight")), ["superscript", "subscript"].includes(H(e, "vertAlign")) && (t["vertical-align"] = H(e, "vertAlign") === "superscript" ? "super" : "sub"), U(B(e, "caps")) && (t["text-transform"] = "uppercase"), H(e, "spacing") && (t["letter-spacing"] = W(H(e, "spacing"))), H(e, "position") && (t["--az-position"] = H(e, "position")), t;
+	/^[\da-f]{6}$/i.test(o) ? n["background-color"] = `#${o}` : H(e, "highlight") && H(e, "highlight") !== "none" && (n["background-color"] = H(e, "highlight"));
+	let s = H(e, "vertAlign");
+	return [
+		"superscript",
+		"subscript",
+		"baseline"
+	].includes(s) && (n["vertical-align"] = {
+		superscript: "super",
+		subscript: "sub",
+		baseline: "baseline"
+	}[s]), B(e, "caps") && (n["text-transform"] = U(B(e, "caps")) ? "uppercase" : "none"), H(e, "spacing") && (n["letter-spacing"] = W(H(e, "spacing"))), H(e, "position") && (n["--az-position"] = H(e, "position")), n;
+}
+function pe(e, t) {
+	let n = t.reduce((e, t) => K(t, e), {}), r = {
+		...e,
+		...n
+	};
+	for (let [t, i, a] of [[
+		"text-transform",
+		"uppercase",
+		"none"
+	], [
+		"--az-decoration-strike",
+		"1",
+		"0"
+	]]) n[t] !== void 0 && (r[t] = e[t] === i == (n[t] === i) ? a : i);
+	return K(null, r);
 }
-function pe(e) {
+function me(e) {
 	let t = {}, n = H(e, "jc");
 	n && (t["text-align"] = {
 		both: "justify",
@@ -645,7 +685,7 @@ function pe(e) {
 	}
 	return t;
 }
-function me(e) {
+function he(e) {
 	if (!e) return;
 	if (["nil", "none"].includes(V(e))) return "none";
 	let t = {
@@ -657,7 +697,7 @@ function me(e) {
 }
 //#endregion
 //#region src/library/hujjat/page-layout.ts
-function he(e) {
+function ge(e) {
 	let t = E().page, n = B(e, "pgSz"), r = B(e, "pgMar"), i = (e, t, n) => V(e, t) === "" ? n : Number(V(e, t)), a = i(n, "w", t.widthTwips), o = i(n, "h", t.heightTwips);
 	return E({ page: {
 		widthTwips: a,
@@ -666,10 +706,10 @@ function he(e) {
 		margins: Object.fromEntries(Object.entries(t.margins).map(([e, t]) => [e, i(r, e, t)]))
 	} }).page;
 }
-function ge(e, t, n, r) {
+function _e(e, t, n, r) {
 	let i = E(t), a = Array.from(e.getElementsByTagNameNS(R, "sectPr")), o;
 	try {
-		o = a.map(he);
+		o = a.map(ge);
 	} catch (e) {
 		M(n, "unsupported-page-layout", e instanceof Error ? e.message : "Неподдерживаемые параметры страницы.", "loss", {
 			stage: "export",
@@ -702,7 +742,7 @@ function ge(e, t, n, r) {
 }
 //#endregion
 //#region src/library/hujjat/paragraph-format.ts
-function _e(e) {
+function ve(e) {
 	let t, n = "auto";
 	for (let r of e) {
 		let e = B(r, "spacing");
@@ -715,10 +755,10 @@ function _e(e) {
 		rule: n
 	} : void 0;
 }
-function ve(e) {
+function ye(e) {
 	return e.rule === "auto" ? String(e.value / 240) : `${e.value / 20}pt`;
 }
-function ye(e) {
+function be(e) {
 	let t = 0, n = 0;
 	for (let r of e) {
 		if (r["--az-hidden"] === "1") continue;
@@ -729,7 +769,7 @@ function ye(e) {
 }
 //#endregion
 //#region src/library/hujjat/docx-chrome.ts
-async function be(e, t, n, r, i) {
+async function xe(e, t, n, r, i) {
 	let a = Object.keys(e.files).filter((e) => /^word\/(header|footer)[^/]*\.xml$/.test(e)), o = Array.from(t.getElementsByTagNameNS(R, "sectPr")).flatMap((e) => z(e).filter((e) => ["headerReference", "footerReference"].includes(e.localName)));
 	if (n === void 0) {
 		(a.length || o.length) && M(r, "header-footer-removed", "Для сохранения колонтитулов передайте page (или locales с page) в exportHujjat.", "loss", { stage: "export" });
@@ -772,8 +812,8 @@ async function be(e, t, n, r, i) {
 }
 //#endregion
 //#region src/library/hujjat/server-page.ts
-var xe = 102400;
-function Se(e) {
+var Se = 102400;
+function Ce(e) {
 	if (e == null) return;
 	let t = (e) => {
 		throw new A(`Некорректное поле page.${e} в контракте Hujjat.`);
@@ -810,8 +850,8 @@ function Se(e) {
 		e in n && r !== null && ((!r || typeof r != "object" || Array.isArray(r) || typeof r.html != "string") && t(`${e}.html`), new TextEncoder().encode(r.html).length > 102400 && t(`${e}.html (100 КиБ)`));
 	}
 }
-function Ce(e, t) {
-	if (Se(e), !e) return e;
+function we(e, t) {
+	if (Ce(e), !e) return e;
 	let n = structuredClone(e);
 	for (let e of ["header", "footer"]) {
 		let r = n[e];
@@ -825,9 +865,9 @@ function Ce(e, t) {
 			}
 		})));
 	}
-	return Se(n), n;
+	return Ce(n), n;
 }
-function we(e, t = {}) {
+function Te(e, t = {}) {
 	let n = E();
 	return e?.orientation === "landscape" && ([n.page.widthTwips, n.page.heightTwips] = [n.page.heightTwips, n.page.widthTwips], n.page.orientation = "landscape"), E({
 		...t,
@@ -836,7 +876,7 @@ function we(e, t = {}) {
 }
 //#endregion
 //#region src/library/hujjat/docx-to-html.ts
-async function Te(e, t = {}, n) {
+async function Ee(e, t = {}, n) {
 	if (e.byteLength > 31457280) throw new A("DOCX превышает 30 МиБ.");
 	let r;
 	try {
@@ -851,7 +891,7 @@ async function Te(e, t = {}, n) {
 	if (!Array.from(a?.getElementsByTagNameNS("*", "Override") ?? []).some((e) => e.getAttribute("PartName") === "/word/document.xml" && e.getAttribute("ContentType") === "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml")) throw new A("Файл не является обычным DOCX.");
 	let o = await G(r, "word/document.xml"), s = await G(r, "word/styles.xml"), c = await G(r, "word/numbering.xml"), l = B(o?.documentElement, "body");
 	if (!l) throw new A("В DOCX нет поддерживаемой структуры документа.");
-	let u = [], d = ge(l, t, u, n === void 0 ? void 0 : we(n).page), f, m = (e, t, n = "warning", r, i) => M(u, e, t, n, {
+	let u = [], d = _e(l, t, u, n === void 0 ? void 0 : Te(n).page), f, m = (e, t, n = "warning", r, i) => M(u, e, t, n, {
 		stage: "export",
 		location: f ? { ...f } : void 0,
 		before: r,
@@ -861,7 +901,7 @@ async function Te(e, t = {}, n) {
 	let b = B(s?.documentElement, "docDefaults"), x = {
 		"margin-top": "0pt",
 		"margin-bottom": "8px",
-		...pe(B(B(b, "pPrDefault"), "pPr"))
+		...me(B(B(b, "pPrDefault"), "pPr"))
 	}, S = {
 		"font-family": "freeserif",
 		"font-size": "12pt",
@@ -894,7 +934,7 @@ async function Te(e, t = {}, n) {
 					...f,
 					runIndex: y++
 				};
-				let r = B(e, "rPr"), i = Object.assign({}, t, ...w(H(r, "rStyle")).map((e) => K(B(e, "rPr"))), K(r));
+				let r = B(e, "rPr"), i = K(r, pe(t, w(H(r, "rStyle")).map((e) => B(e, "rPr"))));
 				if (i["--az-hidden"] === "1") return h("hidden-text-removed", "Скрытый текст Word исключён из HTML."), "";
 				Number(i["--az-position"]) && m("baseline-shift-lost", "Вертикальное смещение фрагмента Word не представлено в HTML.", "loss", Number(i["--az-position"]) / 2, 0);
 				let a = Object.fromEntries(Object.entries(i).filter(([e]) => !e.startsWith("--az-")));
@@ -945,24 +985,24 @@ async function Te(e, t = {}, n) {
 			"pageBreakBefore",
 			"spacing"
 		].includes(e.localName)) && V(a, "before") === "0" && V(a, "after") === "0" && V(a, "line") === "1" && V(a, "lineRule") === "exact" && Array.from(e.children).every((e) => e === r)) return { html: "<div style=\"page-break-before:always\"></div>" };
-		let o = [...i.map((e) => B(e, "pPr")), r], s = Object.assign({}, x, ...o.map(pe)), c = o.map((e) => B(e, "numPr")).filter(Boolean).at(-1), l = H(c, "numId"), d = Number(H(c, "ilvl") || 0), p = H(r, "pStyle") === "AzHujjatListContinuation";
+		let o = [...i.map((e) => B(e, "pPr")), r], s = Object.assign({}, x, ...o.map(me)), c = o.map((e) => B(e, "numPr")).filter(Boolean).at(-1), l = H(c, "numId"), d = Number(H(c, "ilvl") || 0), p = H(r, "pStyle") === "AzHujjatListContinuation";
 		if (l && l !== "0" || p) {
-			let e = E.get(l), t = pe(B(z(D.get(H(e, "abstractNumId")), "lvl").find((e) => V(e, "ilvl") === String(d)), "pPr"));
+			let e = E.get(l), t = me(B(z(D.get(H(e, "abstractNumId")), "lvl").find((e) => V(e, "ilvl") === String(d)), "pPr"));
 			s["margin-left"] = W((parseFloat(s["margin-left"] ?? t["margin-left"] ?? "0") || 0) * 20 - 360), s["text-indent"] ??= t["text-indent"] ?? "0pt";
 		}
 		parseFloat(s["text-indent"] ?? "0") < 0 && parseFloat(s["margin-left"] ?? "0") >= 0 && (s["padding-left"] = s["margin-left"] ?? "0pt", s["margin-left"] = "0pt");
-		let _ = _e([B(B(b, "pPrDefault"), "pPr"), ...o]);
-		_ && (s["line-height"] = ve(_));
-		let C = Object.assign({}, S, ...i.map((e) => K(B(e, "rPr")))), O = Object.assign({}, C, K(B(r, "rPr")));
+		let _ = ve([B(B(b, "pPrDefault"), "pPr"), ...o]);
+		_ && (s["line-height"] = ye(_));
+		let C = pe(S, i.map((e) => B(e, "rPr"))), O = K(B(r, "rPr"), C);
 		O["--az-hidden"] === "1" && (m("hidden-paragraph-mark-lost", "Скрытый знак абзаца нельзя представить в HTML; его отдельный шрифт заменён стилем абзаца.", "loss", "hidden", "visible paragraph style"), O = {
 			...C,
 			"--az-hidden": "0"
 		}), s["font-family"] = O["font-family"], s["font-size"] = O["font-size"];
 		let A = Array.from(e.getElementsByTagNameNS(R, "r")).map((e) => {
 			let t = B(e, "rPr");
-			return Object.assign({}, C, ...w(H(t, "rStyle")).map((e) => K(B(e, "rPr"))), K(t));
+			return K(t, pe(C, w(H(t, "rStyle")).map((e) => B(e, "rPr"))));
 		}), j = s["line-height"];
-		j && (/^\d*\.?\d+$/.test(j) ? Number(j) < 1 : j.endsWith("pt") && parseFloat(j) < ye([O, ...A])) && (t.lineSpacingPolicy === "preserve" ? m("line-height-overlap-risk", "Авторский тесный интервал сохранён; строки могут перекрываться. Фактические метрики шрифта требуют проверки.", "warning", j, j) : (s["line-height"] = /^\d*\.?\d+$/.test(j) ? "1" : "normal", m("line-height-normalized", "Тесный межстрочный интервал нормализован по размерам фрагментов. Проверьте переносы на используемых шрифтах.", "warning", j, s["line-height"]))), j?.endsWith("pt") && t.lineSpacingPolicy !== "preserve" && m("line-height-metrics-estimated", "Проверка интервала использует размеры и смещения фрагментов, а не метрики установленного шрифта. Результат нормализации требует проверки на используемых шрифтах.", "warning", j, s["line-height"]), _ && _.rule !== "auto" && m("line-rule-lost", "CSS line-height не сохраняет различие правил Word exact и atLeast.", "warning", _.rule, "CSS line-height"), o.some((e) => B(e, "tabs")) && h("tab-stops-removed", "Позиции, типы и заполнители табуляции не поддерживаются HTML-блоком.");
+		j && (/^\d*\.?\d+$/.test(j) ? Number(j) < 1 : j.endsWith("pt") && parseFloat(j) < be([O, ...A])) && (t.lineSpacingPolicy === "preserve" ? m("line-height-overlap-risk", "Авторский тесный интервал сохранён; строки могут перекрываться. Фактические метрики шрифта требуют проверки.", "warning", j, j) : (s["line-height"] = /^\d*\.?\d+$/.test(j) ? "1" : "normal", m("line-height-normalized", "Тесный межстрочный интервал нормализован по размерам фрагментов. Проверьте переносы на используемых шрифтах.", "warning", j, s["line-height"]))), j?.endsWith("pt") && t.lineSpacingPolicy !== "preserve" && m("line-height-metrics-estimated", "Проверка интервала использует размеры и смещения фрагментов, а не метрики установленного шрифта. Результат нормализации требует проверки на используемых шрифтах.", "warning", j, s["line-height"]), _ && _.rule !== "auto" && m("line-rule-lost", "CSS line-height не сохраняет различие правил Word exact и atLeast.", "warning", _.rule, "CSS line-height"), o.some((e) => B(e, "tabs")) && h("tab-stops-removed", "Позиции, типы и заполнители табуляции не поддерживаются HTML-блоком.");
 		let N = [B(B(b, "pPrDefault"), "pPr"), ...o].map((e) => B(e, "widowControl")).filter(Boolean).at(-1);
 		N && M(u, "widow-control-lost", "Правило висячих строк Word не представлено в HTML-контракте.", "loss", {
 			stage: "export",
@@ -1048,7 +1088,7 @@ async function Te(e, t = {}, n) {
 					"bottom",
 					"left"
 				]) {
-					let i = B(B(e, "tcBorders"), t), o = t === "top" && r > 0 || t === "bottom" && r < c.length - 1 ? "insideH" : t === "left" && x > 0 || t === "right" && x + f < d ? "insideV" : t, s = B(a, o), l = me(i ?? s);
+					let i = B(B(e, "tcBorders"), t), o = t === "top" && r > 0 || t === "bottom" && r < c.length - 1 ? "insideH" : t === "left" && x > 0 || t === "right" && x + f < d ? "insideV" : t, s = B(a, o), l = he(i ?? s);
 					l && (g[`border-${t}`] = l);
 					let u = B(B(e, "tcMar"), t) ?? B(B(n, "tblCellMar"), t);
 					u && V(u, "w") && (g[`padding-${t}`] = W(V(u, "w")));
@@ -1101,7 +1141,7 @@ async function Te(e, t = {}, n) {
 		].includes(a.localName) || (i(), h("unsupported-block", `Блок Word ${a.localName} не поддерживается HTML-адаптером.`)));
 		return i(), n;
 	}
-	let ee = L(l, 0) || "<p><br></p>", te = await be(r, l, n, u, (e, t) => (v = t, O.clear(), g = new Map(Array.from(e.getElementsByTagNameNS(R, "p")).map((e, t) => [e, t])), _ = new Map(Array.from(e.getElementsByTagNameNS(R, "tbl")).map((e, t) => [e, t])), L(e, 0) || "<p><br></p>"));
+	let ee = L(l, 0) || "<p><br></p>", te = await xe(r, l, n, u, (e, t) => (v = t, O.clear(), g = new Map(Array.from(e.getElementsByTagNameNS(R, "p")).map((e, t) => [e, t])), _ = new Map(Array.from(e.getElementsByTagNameNS(R, "tbl")).map((e, t) => [e, t])), L(e, 0) || "<p><br></p>"));
 	return d && n !== void 0 && d.page.orientation !== (te?.orientation ?? "portrait") ? {
 		html: ee,
 		warnings: u,
@@ -1120,7 +1160,7 @@ async function Te(e, t = {}, n) {
 //#endregion
 //#region src/library/hujjat/table-grid.ts
 var q = 1e-7;
-function Ee(e, t, n) {
+function De(e, t, n) {
 	let r = Array.from({ length: e + 1 }, () => []), i = (e, t, n) => {
 		r[e].push({
 			to: t,
@@ -1185,7 +1225,7 @@ function J(e, t) {
 	}
 	return null;
 }
-function De(e) {
+function Oe(e) {
 	if (!e) return null;
 	let t = (t) => ({
 		...e,
@@ -1203,7 +1243,7 @@ function De(e) {
 	}
 	return r > q ? a : null;
 }
-function Oe(e) {
+function ke(e) {
 	let t = J(e), n = J(e, 0);
 	if (n) return n;
 	let r = 0, i = Math.max(...t.map((t, n) => Math.max(e.low[n] - t, t - e.high[n]))) + 1;
@@ -1213,20 +1253,20 @@ function Oe(e) {
 	}
 	return t;
 }
-function ke(e, t, n, r) {
+function Ae(e, t, n, r) {
 	let i = (e) => Number.isFinite(e) && e > 0 && e < (2 ** 53 - 1) / 4;
 	if (!Number.isInteger(e) || e < 1 || e > 1e3 || !i(t) || Math.round(t) < e) throw new A("Некорректный размер сетки таблицы.");
 	for (let t of n) if (!Number.isInteger(t.column) || !Number.isInteger(t.span) || t.column < 0 || t.span < 1 || t.column + t.span > e || !i(t.width)) throw new A("Некорректное ограничение ширины таблицы.");
-	let a = (e) => e.source === "column" ? 0 : e.span === 1 ? 1 : 2, o = (e) => JSON.stringify(Object.entries(e.location ?? {}).sort(([e], [t]) => e < t ? -1 : +(e > t))), s = [...n].sort((e, t) => a(e) - a(t) || e.column - t.column || e.span - t.span || e.width - t.width || o(e).localeCompare(o(t), "en")), c = s.filter((e, t) => !t || a(e) !== a(s[t - 1]) || e.column !== s[t - 1].column || e.span !== s[t - 1].span || e.width !== s[t - 1].width), l = De(Ee(e, t, c));
+	let a = (e) => e.source === "column" ? 0 : e.span === 1 ? 1 : 2, o = (e) => JSON.stringify(Object.entries(e.location ?? {}).sort(([e], [t]) => e < t ? -1 : +(e > t))), s = [...n].sort((e, t) => a(e) - a(t) || e.column - t.column || e.span - t.span || e.width - t.width || o(e).localeCompare(o(t), "en")), c = s.filter((e, t) => !t || a(e) !== a(s[t - 1]) || e.column !== s[t - 1].column || e.span !== s[t - 1].span || e.width !== s[t - 1].width), l = Oe(De(e, t, c));
 	if (!l) {
 		let n = [];
-		l = De(Ee(e, t, []));
+		l = Oe(De(e, t, []));
 		for (let r of c) {
-			let i = De(Ee(e, t, [...n, r]));
+			let i = Oe(De(e, t, [...n, r]));
 			i && (i.groups < l.groups && n.push(r), l = i);
 		}
 	}
-	let u = Oe(l), d = l.offset.map((e, t) => e + u[l.component[t]]), f = Math.round(t), p = d.map((e) => Math.round(e));
+	let u = ke(l), d = l.offset.map((e, t) => e + u[l.component[t]]), f = Math.round(t), p = d.map((e) => Math.round(e));
 	p[0] = 0, p[e] = f;
 	let m = d.map((e) => Math.floor(e + 1 + q));
 	m[e] = f;
@@ -1251,7 +1291,7 @@ function ke(e, t, n, r) {
 }
 //#endregion
 //#region src/library/hujjat/html-to-docx.ts
-var Ae = /^(font-|color$|text-align$|text-indent$|text-transform$|line-height$|letter-spacing$|white-space$|text-decoration$|vertical-align$)/, je = new Set("p div h1 h2 h3 h4 h5 h6 ul ol li table hr".split(" ")), Me = {
+var je = /^(font-|color$|text-align$|text-indent$|text-transform$|line-height$|letter-spacing$|white-space$|text-decoration$|vertical-align$)/, Me = new Set("p div h1 h2 h3 h4 h5 h6 ul ol li table hr".split(" ")), Ne = {
 	black: "000000",
 	white: "FFFFFF",
 	red: "FF0000",
@@ -1275,7 +1315,7 @@ function Y(e) {
 	if (/^#[\da-f]{6}$/i.test(e)) return e.slice(1);
 	if (/^#[\da-f]{3}$/i.test(e)) return e.slice(1).split("").map((e) => e + e).join("");
 	let t = e.match(/^rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/i);
-	return t ? t.slice(1).map((e) => Math.min(255, Number(e)).toString(16).padStart(2, "0")).join("") : Me[e.toLowerCase()];
+	return t ? t.slice(1).map((e) => Math.min(255, Number(e)).toString(16).padStart(2, "0")).join("") : Ne[e.toLowerCase()];
 }
 function X(e) {
 	if (e === "0") return 0;
@@ -1292,10 +1332,11 @@ function X(e) {
 var Z = (e) => {
 	let t = X(e);
 	return t === void 0 ? void 0 : Math.round(t * 20);
-}, Ne = (e, t) => (Z(e[`margin-${t}`]) ?? 0) + Math.max(0, Z(e[`padding-${t}`]) ?? 0);
+}, Pe = (e, t) => (Z(e[`margin-${t}`]) ?? 0) + Math.max(0, Z(e[`padding-${t}`]) ?? 0);
 function Q(e, t) {
 	let n = { ...t }, r = e.style;
 	for (let e of Array.from(r)) n[e] = r.getPropertyValue(e).trim();
+	r.textDecoration && (n["text-decoration"] = r.textDecoration);
 	for (let e of [
 		"before",
 		"after",
@@ -1320,8 +1361,8 @@ function Q(e, t) {
 		h3: "12pt"
 	}[i] ?? "12pt"), r.fontWeight || (n["font-weight"] = "bold")), n;
 }
-var Pe = (e) => Object.fromEntries(Object.entries(e).filter(([e]) => Ae.test(e)));
-async function Fe(e, t, n = E(), r) {
+var Fe = (e) => Object.fromEntries(Object.entries(e).filter(([e]) => je.test(e)));
+async function Ie(e, t, n = E(), r) {
 	let i = {
 		width: T(n.page),
 		cell: !1
@@ -1359,7 +1400,7 @@ async function Fe(e, t, n = E(), r) {
 			n || d.push(e);
 			return;
 		}
-		let r = e instanceof Element ? e : null, i = r && (je.has(r.localName) || [
+		let r = e instanceof Element ? e : null, i = r && (Me.has(r.localName) || [
 			"br",
 			"td",
 			"th",
@@ -1415,7 +1456,7 @@ async function Fe(e, t, n = E(), r) {
 				}
 			};
 			i(r), a(s, r);
-			let c = Z(p) / 20 < ye(e), l = n.lineSpacingPolicy === "normalize";
+			let c = Z(p) / 20 < be(e), l = n.lineSpacingPolicy === "normalize";
 			c && M(t, l ? "line-height-normalized" : "line-height-overlap-risk", l ? "Тесный абсолютный интервал заменён естественным одинарным интервалом." : "Тесный абсолютный интервал сохранён; проверьте наложение строк.", "warning", {
 				stage: "import",
 				location: { htmlPath: o.htmlPath },
@@ -1496,7 +1537,7 @@ async function Fe(e, t, n = E(), r) {
 				let d = [], f = o.parentElement;
 				for (; f && f !== e;) d.unshift(f), f = f.parentElement;
 				let p = (e) => ({
-					...Pe(e),
+					...Fe(e),
 					...e["background-color"] ? { "background-color": e["background-color"] } : {}
 				}), g = Q(o, p(d.reduce((e, t) => Q(t, p(e)), n)));
 				o.localName === "th" && (g["font-weight"] = "bold");
@@ -1548,7 +1589,7 @@ async function Fe(e, t, n = E(), r) {
 			}
 		}
 		if (_ > o) throw new A("Число явных колонок превышает логическую сетку ячеек.");
-		let v = ke(o, p, s, t), b = "<w:p><w:pPr><w:spacing w:before=\"0\" w:after=\"0\"/></w:pPr></w:p>", x = !0, w = g.map((e, n) => {
+		let v = Ae(o, p, s, t), b = "<w:p><w:pPr><w:spacing w:before=\"0\" w:after=\"0\"/></w:pPr></w:p>", x = !0, S = g.map((e, n) => {
 			let r = i[n], a = Q(r, {}), o = Z(a.height), s = o !== void 0 && o >= 0 ? `<w:trHeight w:val="${o}" w:hRule="atLeast"/>` : "";
 			["avoid", "auto"].includes(a["page-break-inside"]) && (s += `<w:cantSplit w:val="${a["page-break-inside"] === "avoid" ? "1" : "0"}"/>`);
 			let c = r.parentElement?.localName === "thead";
@@ -1573,7 +1614,7 @@ async function Fe(e, t, n = E(), r) {
 				l && (o += `<w:tcBorders>${l}</w:tcBorders>`);
 				let u = c.map((e) => Z(i[`padding-${e}`]) === void 0 ? "" : `<w:${e} w:w="${Math.max(0, Z(i[`padding-${e}`]))}" w:type="dxa"/>`).join("");
 				u && (o += `<w:tcMar>${u}</w:tcMar>`);
-				let d = Math.max(1, a - Math.max(0, Z(i["padding-left"]) ?? 0) - Math.max(0, Z(i["padding-right"]) ?? 0)), f = C(S(e.childNodes, Pe(i), void 0, {
+				let d = Math.max(1, a - Math.max(0, Z(i["padding-left"]) ?? 0) - Math.max(0, Z(i["padding-right"]) ?? 0)), f = w(C(e.childNodes, Fe(i), void 0, {
 					width: d,
 					cell: !0
 				}));
@@ -1585,12 +1626,30 @@ async function Fe(e, t, n = E(), r) {
 			"bottom",
 			"right"
 		].map((t) => y(e, t)).join(""), O = n["table-layout"] === "auto" ? "autofit" : "fixed";
-		return `<w:tbl><w:tblPr>${E}${u ? `<w:tblInd w:w="${u}" w:type="dxa"/>` : ""}${D ? `<w:tblBorders>${D}</w:tblBorders>` : ""}<w:tblLayout w:type="${O}"/></w:tblPr><w:tblGrid>${T}</w:tblGrid>${w}</w:tbl>`;
+		return `<w:tbl><w:tblPr>${E}${u ? `<w:tblInd w:w="${u}" w:type="dxa"/>` : ""}${D ? `<w:tblBorders>${D}</w:tblBorders>` : ""}<w:tblLayout w:type="${O}"/></w:tblPr><w:tblGrid>${T}</w:tblGrid>${S}</w:tbl>`;
 	}
 	function x(e, t) {
 		return e.length && (e[0].before ||= t["page-break-before"] === "always", e[e.length - 1].after ||= t["page-break-after"] === "always"), e;
 	}
-	function S(e, n, a, c = i) {
+	function S(e, n, r) {
+		if (n["page-break-inside"] !== "avoid") return e;
+		if (e.some((e) => e.table)) return M(t, "keep-group-not-representable", "Группа с таблицей не может быть целиком удержана на странице текущим HTML/DOCX-адаптером.", "loss", {
+			stage: "import",
+			location: { htmlPath: r },
+			before: "page-break-inside:avoid",
+			after: null
+		}), e;
+		let i = (e, t, n) => e.replace(/<w:pPr>(.*?)<\/w:pPr>/s, (e, r) => `<w:pPr>${r.replace(RegExp(`<w:${t}\\b[^>]*\\/>`, "g"), "")}<w:${t} w:val="${n ? "1" : "0"}"/></w:pPr>`);
+		return e.map((t, n) => {
+			if (t.marker) return t;
+			let r = i(t.xml, "keepLines", !0), a = e[n + 1];
+			return a && (r = i(r, "keepNext", !t.after && !a.marker && !a.before)), {
+				...t,
+				xml: r
+			};
+		});
+	}
+	function C(e, n, a, c = i) {
 		let u = [], d = [], f = 0, p = Array.from(e).filter((e) => e.nodeType !== 3 || e.textContent), m = (e, t = e) => ({
 			...c,
 			before: e === 0 ? c.before : void 0,
@@ -1599,19 +1658,19 @@ async function Fe(e, t, n = E(), r) {
 			d.length && u.push(...x([{ xml: v(d, n, a, m(f, e)) }], n)), d = [];
 		};
 		for (let [e, i] of p.entries()) {
-			if (!(i instanceof Element) || !je.has(i.localName)) {
+			if (!(i instanceof Element) || !Me.has(i.localName)) {
 				d.length || (f = e), d.push(i);
 				continue;
 			}
 			h(e - 1);
-			let p = Q(i, Pe(n)), g = {
+			let p = Q(i, Fe(n)), g = {
 				...m(e),
 				htmlPath: l.get(i)
 			};
-			if (i.localName === "p" && r?.paragraph_spacing !== void 0 && (p["margin-bottom"] ??= `${r.paragraph_spacing}pt`), r !== void 0 && i.localName === "h1" && (p["margin-bottom"] ??= "7.5pt"), i.localName === "table") u.push(...x([{
+			if (i.localName === "p" && r?.paragraph_spacing !== void 0 && (p["margin-bottom"] ??= `${r.paragraph_spacing}pt`), r !== void 0 && i.localName === "h1" && (p["margin-bottom"] ??= "7.5pt"), i.localName === "table") u.push(...x(S([{
 				xml: b(i, p, g),
 				table: !0
-			}], p));
+			}], p, g.htmlPath), p));
 			else if (i.localName === "ol" || i.localName === "ul") {
 				let e = o++;
 				s.push({
@@ -1623,30 +1682,30 @@ async function Fe(e, t, n = E(), r) {
 					let a = {
 						id: e,
 						pending: !0
-					}, o = Q(i, Pe(p)), s = {
+					}, o = Q(i, Fe(p)), s = {
 						...g,
 						before: Math.max(t === 0 ? g.before ?? 0 : 0, Z(o["margin-top"]) ?? 0),
 						after: Math.max(t === n.length - 1 ? g.after ?? 0 : 0, Z(o["margin-bottom"]) ?? 0),
-						left: (g.left ?? 0) + Ne(p, "left") + Ne(o, "left"),
-						right: (g.right ?? 0) + Ne(p, "right") + Ne(o, "right")
-					}, c = Object.fromEntries(Object.entries(o).filter(([e]) => !/^(margin|padding)(-|$)/.test(e))), l = S(i.childNodes, c, a, s);
-					r.push(...x(l.length ? l : [{ xml: v([], c, a, s) }], o));
+						left: (g.left ?? 0) + Pe(p, "left") + Pe(o, "left"),
+						right: (g.right ?? 0) + Pe(p, "right") + Pe(o, "right")
+					}, c = Object.fromEntries(Object.entries(o).filter(([e]) => !/^(margin|padding)(-|$)/.test(e))), u = C(i.childNodes, c, a, s);
+					r.push(...x(S(u.length ? u : [{ xml: v([], c, a, s) }], o, l.get(i)), o));
 				}
-				u.push(...x(r, p));
-			} else i.localName === "div" && Array.from(i.children).some((e) => je.has(e.localName)) ? u.push(...x(S(i.childNodes, Pe(p), a, {
+				u.push(...x(S(r, p, g.htmlPath), p));
+			} else i.localName === "div" && Array.from(i.children).some((e) => Me.has(e.localName)) ? u.push(...x(S(C(i.childNodes, Fe(p), a, {
 				...g,
-				left: (g.left ?? 0) + Ne(p, "left"),
-				right: (g.right ?? 0) + Ne(p, "right"),
+				left: (g.left ?? 0) + Pe(p, "left"),
+				right: (g.right ?? 0) + Pe(p, "right"),
 				before: Math.max(g.before ?? 0, Z(p["margin-top"]) ?? 0),
 				after: Math.max(g.after ?? 0, Z(p["margin-bottom"]) ?? 0)
-			}), p)) : i.localName === "div" && !i.children.length && !i.textContent && p["page-break-before"] === "always" && Array.from(i.style).every((e) => ["page-break-before", "break-before"].includes(e)) ? u.push({
+			}), p, g.htmlPath), p)) : i.localName === "div" && !i.children.length && !i.textContent && p["page-break-before"] === "always" && Array.from(i.style).every((e) => ["page-break-before", "break-before"].includes(e)) ? u.push({
 				xml: "",
 				marker: !0
 			}) : i.localName === "hr" ? (M(t, "rule-normalized", "Разделитель HTML преобразован в строку."), u.push(...x([{ xml: v([document.createTextNode("────────────────")], p, void 0, c) }], p))) : u.push(...x([{ xml: v(i.childNodes, p, a, g) }], p));
 		}
 		return h(p.length - 1), u;
 	}
-	function C(e) {
+	function w(e) {
 		let t = "<w:p><w:pPr><w:pStyle w:val=\"AzHujjatPageBoundary\"/><w:pageBreakBefore/><w:spacing w:before=\"0\" w:after=\"0\" w:line=\"1\" w:lineRule=\"exact\"/></w:pPr></w:p>", n = "", r = !1, i = 0;
 		for (let a of e) {
 			if (a.marker) {
@@ -1658,14 +1717,16 @@ async function Fe(e, t, n = E(), r) {
 		}
 		return n + t.repeat(i);
 	}
-	let w = C(S(a.childNodes, h)) || "<w:p/>", D = c.map((e) => ({
+	let D = w(C(a.childNodes, h)) || "<w:p/>", O = c.map((e) => ({
 		...e,
-		xml: C(S(e.root.childNodes, h)) || "<w:p/>"
+		xml: w(C(e.root.childNodes, h)) || "<w:p/>"
 	}));
-	if (new TextEncoder().encode(w + D.map((e) => e.xml).join("")).byteLength > 8387584) throw new A("После преобразования HTML документ превышает допустимый размер XML (8 МиБ).");
-	let O = new Set("font-family font-size font-weight font-style color background-color text-align text-decoration text-transform vertical-align letter-spacing line-height margin margin-top margin-bottom margin-left margin-right text-indent width border border-style border-width border-color border-top border-right border-bottom border-left border-collapse table-layout padding padding-top padding-right padding-bottom padding-left page-break-before page-break-after page-break-inside break-before break-after break-inside".split(" "));
+	if (new TextEncoder().encode(D + O.map((e) => e.xml).join("")).byteLength > 8387584) throw new A("После преобразования HTML документ превышает допустимый размер XML (8 МиБ).");
+	let k = new Set("font-family font-size font-weight font-style color background-color text-align text-decoration text-transform vertical-align letter-spacing line-height margin margin-top margin-bottom margin-left margin-right text-indent width border border-style border-width border-color border-top border-right border-bottom border-left border-collapse table-layout padding padding-top padding-right padding-bottom padding-left page-break-before page-break-after page-break-inside break-before break-after break-inside".split(" "));
 	for (let e of [a, ...c.map((e) => e.root)]) for (let n of e.querySelectorAll("[style]")) for (let e of Array.from(n.style)) {
-		let r = n.style.getPropertyValue(e), i = ["td", "th"].includes(n.localName);
+		let r = n.style.getPropertyValue(e);
+		if (e === "text-decoration-line" && /^(none|underline|line-through|underline line-through|line-through underline)$/.test(r) || e === "text-decoration-style" && ["initial", "solid"].includes(r) || e === "text-decoration-color" && ["initial", "currentcolor"].includes(r) || e === "text-decoration-thickness" && ["initial", "auto"].includes(r)) continue;
+		let i = ["td", "th"].includes(n.localName);
 		e === "vertical-align" && !i && ![
 			"baseline",
 			"sub",
@@ -1676,39 +1737,39 @@ async function Fe(e, t, n = E(), r) {
 			before: r,
 			after: "baseline"
 		});
-		let a = je.has(n.localName) && !["table", "hr"].includes(n.localName), o = e.startsWith("padding") && !i && (!a || !["padding-left", "padding-right"].includes(e)) || e.startsWith("border") && !i && n.localName !== "table" || e === "font-size" && X(r) === void 0 || ["color", "background-color"].includes(e) && Y(r) === void 0, s = n.localName === "tr" && e === "height" && Z(r) !== void 0 && Z(r) >= 0;
-		(o || !s && !O.has(e) && !/^border-(top|right|bottom|left)-(width|style|color)$/.test(e)) && M(t, "html-style-approximation", `Стиль ${e} может измениться при открытии HTML в DOCX-редакторе.`, "warning", {
+		let a = Me.has(n.localName) && !["table", "hr"].includes(n.localName), o = e.startsWith("padding") && !i && (!a || !["padding-left", "padding-right"].includes(e)) || e.startsWith("border") && !i && n.localName !== "table" || e === "font-size" && X(r) === void 0 || ["color", "background-color"].includes(e) && Y(r) === void 0, s = n.localName === "tr" && e === "height" && Z(r) !== void 0 && Z(r) >= 0;
+		(o || !s && !k.has(e) && !/^border-(top|right|bottom|left)-(width|style|color)$/.test(e)) && M(t, "html-style-approximation", `Стиль ${e} может измениться при открытии HTML в DOCX-редакторе.`, "warning", {
 			stage: "import",
 			location: { htmlPath: l.get(n) },
 			before: r
 		});
 	}
-	let k = new p();
-	k.file("[Content_Types].xml", "<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\"><Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/><Default Extension=\"xml\" ContentType=\"application/xml\"/><Override PartName=\"/word/document.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml\"/><Override PartName=\"/word/styles.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml\"/><Override PartName=\"/word/numbering.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml\"/></Types>"), k.file("_rels/.rels", "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument\" Target=\"word/document.xml\"/></Relationships>"), k.file("word/_rels/document.xml.rels", "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rIdStyles\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles\" Target=\"styles.xml\"/><Relationship Id=\"rIdNumbering\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering\" Target=\"numbering.xml\"/></Relationships>");
-	let j = n.page, N = "http://schemas.openxmlformats.org/officeDocument/2006/relationships", P = D.map(({ kind: e }) => `<w:${e}Reference w:type="default" r:id="rId${e}"/>`).join("");
-	for (let { kind: e, xml: t } of D) k.file(`word/${e}1.xml`, `<w:${e === "header" ? "hdr" : "ftr"} xmlns:w="${R}">${t}</w:${e === "header" ? "hdr" : "ftr"}>`);
-	let F = await k.file("[Content_Types].xml").async("string");
-	k.file("[Content_Types].xml", F.replace("</Types>", D.map(({ kind: e }) => `<Override PartName="/word/${e}1.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.${e}+xml"/>`).join("") + "</Types>"));
-	let I = await k.file("word/_rels/document.xml.rels").async("string");
-	return k.file("word/_rels/document.xml.rels", I.replace("</Relationships>", D.map(({ kind: e }) => `<Relationship Id="rId${e}" Type="${N}/${e}" Target="${e}1.xml"/>`).join("") + "</Relationships>")), k.file("word/document.xml", `<w:document xmlns:w="${R}" xmlns:r="${N}"><w:body>${w}<w:sectPr>${P}<w:pgSz w:w="${j.widthTwips}" w:h="${j.heightTwips}" w:orient="${j.orientation}"/><w:pgMar ${Object.entries(j.margins).map(([e, t]) => `w:${e}="${t}"`).join(" ")}/></w:sectPr></w:body></w:document>`), k.file("word/styles.xml", `<w:styles xmlns:w="${R}"><w:docDefaults><w:rPrDefault><w:rPr>${g(h)}</w:rPr></w:rPrDefault></w:docDefaults><w:style w:type="paragraph" w:default="1" w:styleId="Normal"><w:name w:val="Normal"/><w:pPr><w:spacing w:after="120"/></w:pPr></w:style><w:style w:type="paragraph" w:styleId="AzHujjatListContinuation"><w:name w:val="List continuation"/><w:basedOn w:val="Normal"/></w:style><w:style w:type="paragraph" w:styleId="AzHujjatPageBoundary"><w:name w:val="Page boundary"/><w:basedOn w:val="Normal"/></w:style></w:styles>`), k.file("word/numbering.xml", `<w:numbering xmlns:w="${R}">${s.map(({ id: e, tag: t }) => `<w:abstractNum w:abstractNumId="${e}"><w:multiLevelType w:val="singleLevel"/><w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="${t === "ol" ? "decimal" : "bullet"}"/><w:lvlText w:val="${t === "ol" ? "%1." : "•"}"/><w:pPr><w:ind w:left="360" w:hanging="180"/></w:pPr></w:lvl></w:abstractNum><w:num w:numId="${e}"><w:abstractNumId w:val="${e}"/></w:num>`).join("")}</w:numbering>`), new Uint8Array(await k.generateAsync({
+	let j = new p();
+	j.file("[Content_Types].xml", "<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\"><Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/><Default Extension=\"xml\" ContentType=\"application/xml\"/><Override PartName=\"/word/document.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml\"/><Override PartName=\"/word/styles.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml\"/><Override PartName=\"/word/numbering.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml\"/></Types>"), j.file("_rels/.rels", "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument\" Target=\"word/document.xml\"/></Relationships>"), j.file("word/_rels/document.xml.rels", "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\"><Relationship Id=\"rIdStyles\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles\" Target=\"styles.xml\"/><Relationship Id=\"rIdNumbering\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering\" Target=\"numbering.xml\"/></Relationships>");
+	let N = n.page, P = "http://schemas.openxmlformats.org/officeDocument/2006/relationships", F = O.map(({ kind: e }) => `<w:${e}Reference w:type="default" r:id="rId${e}"/>`).join("");
+	for (let { kind: e, xml: t } of O) j.file(`word/${e}1.xml`, `<w:${e === "header" ? "hdr" : "ftr"} xmlns:w="${R}">${t}</w:${e === "header" ? "hdr" : "ftr"}>`);
+	let I = await j.file("[Content_Types].xml").async("string");
+	j.file("[Content_Types].xml", I.replace("</Types>", O.map(({ kind: e }) => `<Override PartName="/word/${e}1.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.${e}+xml"/>`).join("") + "</Types>"));
+	let L = await j.file("word/_rels/document.xml.rels").async("string");
+	return j.file("word/_rels/document.xml.rels", L.replace("</Relationships>", O.map(({ kind: e }) => `<Relationship Id="rId${e}" Type="${P}/${e}" Target="${e}1.xml"/>`).join("") + "</Relationships>")), j.file("word/document.xml", `<w:document xmlns:w="${R}" xmlns:r="${P}"><w:body>${D}<w:sectPr>${F}<w:pgSz w:w="${N.widthTwips}" w:h="${N.heightTwips}" w:orient="${N.orientation}"/><w:pgMar ${Object.entries(N.margins).map(([e, t]) => `w:${e}="${t}"`).join(" ")}/></w:sectPr></w:body></w:document>`), j.file("word/styles.xml", `<w:styles xmlns:w="${R}"><w:docDefaults><w:rPrDefault><w:rPr>${g(h)}</w:rPr></w:rPrDefault></w:docDefaults><w:style w:type="paragraph" w:default="1" w:styleId="Normal"><w:name w:val="Normal"/><w:pPr><w:spacing w:after="120"/></w:pPr></w:style><w:style w:type="paragraph" w:styleId="AzHujjatListContinuation"><w:name w:val="List continuation"/><w:basedOn w:val="Normal"/></w:style><w:style w:type="paragraph" w:styleId="AzHujjatPageBoundary"><w:name w:val="Page boundary"/><w:basedOn w:val="Normal"/></w:style></w:styles>`), j.file("word/numbering.xml", `<w:numbering xmlns:w="${R}">${s.map(({ id: e, tag: t }) => `<w:abstractNum w:abstractNumId="${e}"><w:multiLevelType w:val="singleLevel"/><w:lvl w:ilvl="0"><w:start w:val="1"/><w:numFmt w:val="${t === "ol" ? "decimal" : "bullet"}"/><w:lvlText w:val="${t === "ol" ? "%1." : "•"}"/><w:pPr><w:ind w:left="360" w:hanging="180"/></w:pPr></w:lvl></w:abstractNum><w:num w:numId="${e}"><w:abstractNumId w:val="${e}"/></w:num>`).join("")}</w:numbering>`), new Uint8Array(await j.generateAsync({
 		type: "arraybuffer",
 		compression: "DEFLATE"
 	}));
 }
 //#endregion
 //#region src/library/hujjat/docx.ts
-async function Ie(e, t) {
+async function Le(e, t) {
 	let n = t.page === void 0 ? t.locales?.[t.locale]?.page : t.page;
-	Se(n);
-	let r = await Te(e, t.layout, n), i = le(t.locales ?? {}, t.locale, r.html);
-	return i.warnings.unshift(...r.warnings), i.layout = r.layout, i.page = Ce(r.page, i), i.page !== void 0 && (i.locales[t.locale].page = structuredClone(i.page)), N(i.warnings, t.allowLossy), i;
+	Ce(n);
+	let r = await Ee(e, t.layout, n), i = le(t.locales ?? {}, t.locale, r.html);
+	return i.warnings.unshift(...r.warnings), i.layout = r.layout, i.page = we(r.page, i), i.page !== void 0 && (i.locales[t.locale].page = structuredClone(i.page)), N(i.warnings, t.allowLossy), i;
 }
-async function Le(e, t, n = {}) {
+async function Re(e, t, n = {}) {
 	let r = oe(ce(e, t));
-	r.page = Ce(e[t]?.page, r);
-	let i = we(r.page, n.layout);
-	D(i.page, we(r.page).page) || M(r.warnings, "layout-not-carried-by-html", "Геометрия layout отличается от настроек page на сервере. Текущий PDF-контракт поддерживает только ориентацию A4 и фиксированные поля.", "warning", { stage: "import" });
-	let a = await Fe(r.html, r.warnings, i, r.page);
+	r.page = we(e[t]?.page, r);
+	let i = Te(r.page, n.layout);
+	D(i.page, Te(r.page).page) || M(r.warnings, "layout-not-carried-by-html", "Геометрия layout отличается от настроек page на сервере. Текущий PDF-контракт поддерживает только ориентацию A4 и фиксированные поля.", "warning", { stage: "import" });
+	let a = await Ie(r.html, r.warnings, i, r.page);
 	return N(r.warnings, n.allowLossy), {
 		...r,
 		document: a,
@@ -1717,7 +1778,7 @@ async function Le(e, t, n = {}) {
 }
 //#endregion
 //#region src/library/document-diagnostics.ts
-async function Re(e) {
+async function ze(e) {
 	if (e.byteLength > 31457280) throw new A("DOCX превышает 30 МиБ.");
 	let t = await p.loadAsync(e);
 	if (Object.keys(t.files).length > 2e3) throw new A("В DOCX более 2000 частей.");
@@ -1745,13 +1806,13 @@ async function Re(e) {
 		let n = {
 			part: "word/document.xml",
 			paragraphIndex: t
-		}, r = B(e, "pPr"), i = d(H(r, "pStyle") || V(u, "styleId")), o = _e([
+		}, r = B(e, "pPr"), i = d(H(r, "pStyle") || V(u, "styleId")), o = ve([
 			s,
 			...i.map((e) => B(e, "pPr")),
 			r
-		]), l = Object.assign({}, c, ...i.map((e) => K(B(e, "rPr")))), f = [Object.assign({}, l, K(B(r, "rPr")))];
+		]), l = pe(c, i.map((e) => B(e, "rPr"))), f = [K(B(r, "rPr"), l)];
 		Array.from(e.getElementsByTagNameNS(R, "r")).forEach((e, t) => {
-			let r = B(e, "rPr"), i = Object.assign({}, l, ...d(H(r, "rStyle")).map((e) => K(B(e, "rPr"))), K(r));
+			let r = B(e, "rPr"), i = K(r, pe(l, d(H(r, "rStyle")).map((e) => B(e, "rPr"))));
 			i["--az-hidden"] !== "1" && (f.push(i), Number(i["--az-position"]) && M(a, "source-baseline-shift", "Исходный фрагмент смещён по вертикали; сохранён без нормализации.", "warning", {
 				stage: "import",
 				location: {
@@ -1761,7 +1822,7 @@ async function Re(e) {
 				before: Number(i["--az-position"]) / 2,
 				after: Number(i["--az-position"]) / 2
 			}));
-		}), o && (o.rule === "auto" ? o.value < 240 : o.value / 20 < ye(f)) && M(a, "source-tight-spacing", "Авторский тесный интервал сохранён. Проверьте наложение строк на используемых шрифтах.", "warning", {
+		}), o && (o.rule === "auto" ? o.value < 240 : o.value / 20 < be(f)) && M(a, "source-tight-spacing", "Авторский тесный интервал сохранён. Проверьте наложение строк на используемых шрифтах.", "warning", {
 			stage: "import",
 			location: n,
 			before: `${o.rule}:${o.value}`,
@@ -1774,7 +1835,7 @@ async function Re(e) {
 }
 //#endregion
 //#region src/library/font-diagnostics.ts
-function ze(e) {
+function Be(e) {
 	let t = 0, n = !1, r = !1, i = 0, a = [], o = /* @__PURE__ */ new Set(), s = {
 		state: typeof e == "function" ? "loading" : "unknown",
 		warnings: []
@@ -1829,8 +1890,8 @@ function ze(e) {
 }
 //#endregion
 //#region src/library/AzDocumentEditor.tsx
-var Be = () => {};
-function Ve({ onStatusChange: e, fonts: t }) {
+var Ve = () => {};
+function He({ onStatusChange: e, fonts: t }) {
 	let r = o(e);
 	i(() => {
 		r.current = e;
@@ -1866,8 +1927,8 @@ function Ve({ onStatusChange: e, fonts: t }) {
 		f
 	]), null;
 }
-var He = e(function(e, t) {
-	let u = o(null), p = o(null), m = o(null), [v, y] = s(""), b = a(() => f(), []), C = d(b), w = e.fonts ?? C, T = a(() => ze(w), [w]), E = c(T.subscribe, T.snapshot, T.snapshot), D = o(e), O = o(0), k = o(!1), j = o(T);
+var Ue = e(function(e, t) {
+	let u = o(null), p = o(null), m = o(null), [v, y] = s(""), b = a(() => f(), []), C = d(b), w = e.fonts ?? C, T = a(() => Be(w), [w]), E = c(T.subscribe, T.snapshot, T.snapshot), D = o(e), O = o(0), k = o(!1), j = o(T);
 	i(() => {
 		D.current = e, j.current = T;
 	}), i(() => {
@@ -1877,7 +1938,7 @@ var He = e(function(e, t) {
 		if (!D.current.onDiagnostics) return;
 		let n;
 		try {
-			n = await Re(e);
+			n = await ze(e);
 		} catch {
 			n = [{
 				code: "diagnostics-unavailable",
@@ -1928,7 +1989,7 @@ var He = e(function(e, t) {
 		async exportHujjat(e) {
 			let t = await u.current?.save();
 			if (!t) throw new A("Документ ещё не готов к экспорту.");
-			return Ie(t, e);
+			return Le(t, e);
 		},
 		insertVariable(e) {
 			if (!P(e)) throw new A("Некорректный ключ переменной. Используйте client.name, ASCII, до 100 символов.");
@@ -1999,8 +2060,8 @@ var He = e(function(e, t) {
 			},
 			menu: N("menu") && {
 				reportIssue: !1,
-				onOpen: Be,
-				onSave: Be,
+				onOpen: Ve,
+				onSave: Ve,
 				children: /* @__PURE__ */ g(l.Menu.File, {
 					preset: !1,
 					children: [
@@ -2036,7 +2097,7 @@ var He = e(function(e, t) {
 					]
 				})
 			},
-			children: /* @__PURE__ */ h(Ve, {
+			children: /* @__PURE__ */ h(He, {
 				onStatusChange: e.onStatusChange,
 				fonts: E
 			})
@@ -2045,12 +2106,12 @@ var He = e(function(e, t) {
 });
 //#endregion
 //#region src/library/AzHtmlEditor.tsx
-function Ue(...e) {
+function We(...e) {
 	let t = /* @__PURE__ */ new Map();
 	for (let n of e.flat()) t.set(JSON.stringify(n), n);
 	return [...t.values()];
 }
-var We = e(function(e, a) {
+var Ge = e(function(e, a) {
 	let { initialHtml: c, layout: l, page: u, onChange: d, onStatusChange: f, renderFallback: p, ...m } = e, [_] = s(c), [v] = s(() => structuredClone(u)), [y] = s(() => l ? {
 		...l,
 		page: l.page ? {
@@ -2079,7 +2140,7 @@ var We = e(function(e, a) {
 			error: null
 		});
 		try {
-			let n = await Le({ uz: {
+			let n = await Re({ uz: {
 				blocks: [{
 					type: "html",
 					props: { html: _.trim() ? _ : "<p><br></p>" }
@@ -2147,7 +2208,7 @@ var We = e(function(e, a) {
 					page: t.page
 				});
 				if (!D.current || r !== O.current || i !== k.current) throw new A("Черновик изменился или закрыт во время экспорта. Повторите экспорт актуального документа.");
-				let a = Ue(t.warnings, n.warnings);
+				let a = We(t.warnings, n.warnings);
 				return M({ warnings: a }), N(a, e.allowLossy), {
 					html: n.html,
 					variables: n.variables,
@@ -2182,7 +2243,7 @@ var We = e(function(e, a) {
 		P,
 		M,
 		L
-	]), b ? /* @__PURE__ */ h(He, {
+	]), b ? /* @__PURE__ */ h(Ue, {
 		...m,
 		ref: T,
 		document: b,
@@ -2203,18 +2264,18 @@ var We = e(function(e, a) {
 			children: [S.error ?? "Загрузка документа…", S.warnings.length > 0 && /* @__PURE__ */ h("ul", { children: S.warnings.map((e, t) => /* @__PURE__ */ h("li", { children: e.message }, t)) })]
 		})
 	});
-}), Ge = 31457280, Ke = "application/vnd.openxmlformats-officedocument.wordprocessingml.document", qe = `${Ke}.main+xml`, Je = 8388608, $ = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
-function Ye(e) {
+}), Ke = 31457280, qe = "application/vnd.openxmlformats-officedocument.wordprocessingml.document", Je = `${qe}.main+xml`, Ye = 8388608, $ = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
+function Xe(e) {
 	let t = new DOMParser().parseFromString(e, "application/xml");
 	if (t.getElementsByTagName("parsererror").length || /<!DOCTYPE/i.test(e)) throw Error("XML документа повреждён или содержит неподдерживаемую структуру.");
 	return t;
 }
-function Xe(e, t) {
+function Ze(e, t) {
 	let n = e.file(t);
 	return n ? new Promise((e, t) => {
 		let r = n.internalStream("uint8array"), i = [], a = 0;
 		r.on("data", (e) => {
-			a += e.byteLength, a > Je ? (r.pause(), t(/* @__PURE__ */ Error("Структура документа слишком большая для этого прототипа."))) : i.push(e);
+			a += e.byteLength, a > Ye ? (r.pause(), t(/* @__PURE__ */ Error("Структура документа слишком большая для этого прототипа."))) : i.push(e);
 		}), r.on("error", t), r.on("end", () => {
 			let t = new Uint8Array(a), n = 0;
 			for (let e of i) t.set(e, n), n += e.byteLength;
@@ -2222,7 +2283,7 @@ function Xe(e, t) {
 		}), r.resume();
 	}) : Promise.resolve("");
 }
-async function Ze(e) {
+async function Qe(e) {
 	if (!/\.docx$/i.test(e.name)) throw Error("Откройте файл DOCX. Форматы DOC, DOCM и PDF здесь не поддерживаются.");
 	if (!e.size) throw Error("Файл DOCX пуст.");
 	if (e.size > 31457280) throw Error("Максимальный размер DOCX — 30 МБ.");
@@ -2235,14 +2296,14 @@ async function Ze(e) {
 	let r = Object.keys(n.files);
 	if (r.length > 2e3) throw Error("Слишком много вложенных частей в DOCX для этого прототипа.");
 	if (!n.file("[Content_Types].xml") || !n.file("word/document.xml")) throw Error("Файл не содержит структуру DOCX.");
-	let i = Ye(await Xe(n, "[Content_Types].xml"));
-	if (Array.from(i.getElementsByTagNameNS("*", "Override")).find((e) => e.getAttribute("PartName") === "/word/document.xml")?.getAttribute("ContentType") !== qe || r.some((e) => /vbaProject\.bin$/i.test(e))) throw Error("Поддерживается только обычный DOCX без макросов.");
-	let a = Ye(await Xe(n, "word/document.xml"));
+	let i = Xe(await Ze(n, "[Content_Types].xml"));
+	if (Array.from(i.getElementsByTagNameNS("*", "Override")).find((e) => e.getAttribute("PartName") === "/word/document.xml")?.getAttribute("ContentType") !== Je || r.some((e) => /vbaProject\.bin$/i.test(e))) throw Error("Поддерживается только обычный DOCX без макросов.");
+	let a = Xe(await Ze(n, "word/document.xml"));
 	if (a.documentElement.localName !== "document" || !a.getElementsByTagNameNS($, "body").length) throw Error("XML документа повреждён или использует неподдерживаемую разновидность DOCX.");
 	let o = /* @__PURE__ */ new Set(), s = [a];
 	for (let e of ["word/styles.xml", "word/fontTable.xml"]) {
-		let t = await Xe(n, e);
-		t && s.push(Ye(t));
+		let t = await Ze(n, e);
+		t && s.push(Xe(t));
 	}
 	for (let e of s) {
 		for (let t of e.getElementsByTagNameNS($, "rFonts")) for (let e of [
@@ -2259,7 +2320,7 @@ async function Ze(e) {
 			e && o.add(e);
 		}
 	}
-	let c = await Xe(n, "docProps/app.xml"), l = c ? Number(Ye(c).getElementsByTagNameNS("*", "Pages")[0]?.textContent) : 0, { openDocumentForExport: u } = await import("@docx-editor.dev/core/export"), d = u(t.slice());
+	let c = await Ze(n, "docProps/app.xml"), l = c ? Number(Xe(c).getElementsByTagNameNS("*", "Pages")[0]?.textContent) : 0, { openDocumentForExport: u } = await import("@docx-editor.dev/core/export"), d = u(t.slice());
 	if (!d.ok) throw Error("Не удалось открыть структуру DOCX. Текущий документ сохранён в редакторе.");
 	return d.session.dispose(), {
 		name: e.name,
@@ -2276,16 +2337,16 @@ async function Ze(e) {
 		}
 	};
 }
-function Qe(e) {
+function $e(e) {
 	return `${(e.replace(/\.docx$/i, "").replace(/[<>:"/\\|?*\x00-\x1f]/g, "_").trim() || "Документ").replace(/ — редакция$/, "")} — редакция.docx`;
 }
-function $e(e, t) {
-	let n = URL.createObjectURL(new Blob([e], { type: Ke })), r = document.createElement("a");
+function et(e, t) {
+	let n = URL.createObjectURL(new Blob([e], { type: qe })), r = document.createElement("a");
 	r.href = n, r.download = t, document.body.append(r), r.click(), r.remove(), window.setTimeout(() => URL.revokeObjectURL(n), 3e4);
 }
 //#endregion
 //#region src/library/pdf-export.ts
-async function et(e, t, n, r = {}) {
+async function tt(e, t, n, r = {}) {
 	let i = AbortSignal.any([AbortSignal.timeout(95e3), ...r.signal ? [r.signal] : []]);
 	i.throwIfAborted();
 	let a = new FormData();
@@ -2314,13 +2375,13 @@ async function et(e, t, n, r = {}) {
 		warnings: (o.headers.get("x-pdf-warnings") ?? "").split(",").filter(Boolean)
 	};
 }
-function tt(e) {
+function nt(e) {
 	let t = URL.createObjectURL(e.blob), n = document.createElement("a");
 	n.href = t, n.download = e.filename, document.body.append(n), n.click(), n.remove(), setTimeout(() => URL.revokeObjectURL(t), 6e4);
 }
 //#endregion
 //#region src/library/pdf-profile.ts
-var nt = {
+var rt = {
 	id: "az-editor-pdf-a0c6eaaeb90716f0",
 	protocolVersion: 1,
 	core: "2.27.0",
@@ -2467,18 +2528,18 @@ var nt = {
 };
 //#endregion
 //#region src/library/hujjat/api.ts
-function rt(e) {
+function it(e) {
 	if (!e || !Object.keys(e).length) throw new A("Нет локалей шаблона.");
 	for (let [t, n] of Object.entries(e)) {
-		if (se(t), Se(n?.page), !n || !Array.isArray(n.blocks) || !n.blocks.length) throw new A(`Нет блоков для ${t}.`);
+		if (se(t), Ce(n?.page), !n || !Array.isArray(n.blocks) || !n.blocks.length) throw new A(`Нет блоков для ${t}.`);
 		for (let e of n.blocks) if (e.type === "html") {
 			if (typeof e.props?.html != "string" || !e.props.html.trim()) throw new A(`Пустой HTML для ${t}.`);
 			if (new TextEncoder().encode(e.props.html).length > 1048576) throw new A(`HTML для ${t} превышает 1 МБ.`);
 		}
 	}
 }
-function it(e, t) {
-	if (rt(t), !t.uz) throw new A("Для создания шаблона обязательна локаль uz.");
+function at(e, t) {
+	if (it(t), !t.uz) throw new A("Для создания шаблона обязательна локаль uz.");
 	if (!e.productId || !e.name.trim() || e.name.length > 255) throw new A("Укажите продукт и название шаблона до 255 символов.");
 	return {
 		product_id: e.productId,
@@ -2487,9 +2548,9 @@ function it(e, t) {
 		locales: structuredClone(t)
 	};
 }
-async function at(e) {
+async function ot(e) {
 	let t = AbortSignal.any([AbortSignal.timeout(95e3), ...e.signal ? [e.signal] : []]);
-	t.throwIfAborted(), rt(e.locales);
+	t.throwIfAborted(), it(e.locales);
 	let n = e.locale ?? "uz";
 	se(n);
 	let r = new Headers(e.headers);
@@ -2519,4 +2580,4 @@ async function at(e) {
 	};
 }
 //#endregion
-export { He as AzDocumentEditor, We as AzHtmlEditor, Ke as DOCX_MIME, O as HUJJAT_LOCALES, xe as HUJJAT_MAX_CHROME_BYTES, k as HUJJAT_MAX_HTML_BYTES, C as HUJJAT_PAGE, A as HujjatCompatibilityError, Ge as MAX_DOCX_BYTES, Re as analyzeDocxFormatting, it as createHujjatTemplatePayload, $e as downloadDocx, tt as downloadPdf, Qe as exportFilename, Ie as exportHujjatDocx, Le as importHujjatTemplate, nt as pdfRenderProfile, Ze as readDocxFile, ce as readHujjatHtml, at as requestHujjatPreview, et as requestPdf, E as resolveHtmlLayout, oe as sanitizeHujjatHtml, Se as validateHujjatPage, P as validateHujjatVariable, le as withHujjatLocale };
+export { Ue as AzDocumentEditor, Ge as AzHtmlEditor, qe as DOCX_MIME, O as HUJJAT_LOCALES, Se as HUJJAT_MAX_CHROME_BYTES, k as HUJJAT_MAX_HTML_BYTES, C as HUJJAT_PAGE, A as HujjatCompatibilityError, Ke as MAX_DOCX_BYTES, ze as analyzeDocxFormatting, at as createHujjatTemplatePayload, et as downloadDocx, nt as downloadPdf, $e as exportFilename, Le as exportHujjatDocx, Re as importHujjatTemplate, rt as pdfRenderProfile, Qe as readDocxFile, ce as readHujjatHtml, ot as requestHujjatPreview, tt as requestPdf, E as resolveHtmlLayout, oe as sanitizeHujjatHtml, Ce as validateHujjatPage, P as validateHujjatVariable, le as withHujjatLocale };

package/dist/library/hujjat/xml.d.ts

@@ -12,6 +12,12 @@ export declare const styleAttr: (css: Css) => string;
 export declare function parseXml(text: string): XMLDocument;
 /** Stream the parts we actually consume; never decompress arbitrary media for HTML export. */
 export declare function readPart(zip: JSZip, path: string): Promise<XMLDocument | null>;
-export declare function runCss(pr: Element | null): Css;
+/** Resolve a layer against its inherited properties before projecting compound CSS. */
+export declare function runCss(pr: Element | null, inherited?: Css): Css;
+/** Resolve one style type's basedOn chain, then combine it with earlier levels.
+ * caps/strike are toggle properties (17.7.3); direct runCss calls are absolute.
+ * Underline, dstrike and vertAlign are ordinary properties, not toggles.
+ */
+export declare function cascadeRunCss(base: Css, properties: (Element | null)[]): Css;
 export declare function paragraphCss(pr: Element | null): Css;
 export declare function borderCss(edge: Element | null): string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makhmudov.kay/az-editor",
-  "version": "0.1.0-beta.8",
+  "version": "0.1.0-beta.9",
   "type": "module",
   "types": "./dist/library/index.d.ts",
   "sideEffects": [