diff --git a/QWERTYkez.WordProcessor/MultiReplace.cs b/QWERTYkez.WordProcessor/MultiReplace.cs index c422853..00bae0e 100644 --- a/QWERTYkez.WordProcessor/MultiReplace.cs +++ b/QWERTYkez.WordProcessor/MultiReplace.cs @@ -1,12 +1,5 @@ namespace QWERTYkez.WordProcessor; -#if DEBUG -public static class Debugger -{ - public static StringBuilder Builder { get; } = new(); -} -#endif - /// /// Выполняет замену всех вхождений ключей из словаря на соответствующие массивы значений. /// Каждое значение из массива помещается в отдельный параграф, причём первое значение @@ -23,15 +16,13 @@ internal static class MultiReplaceExt internal static void Replace(this Body body, string oldValue, IEnumerable newValues, StringComparison comparisonType) { if (body is null || string.IsNullOrEmpty(oldValue) || newValues is null) return; - var dict = new Dictionary> { { oldValue, newValues } }; - body.Replace(dict, comparisonType); + body.Replace(new Dictionary> { { oldValue, newValues } }, comparisonType); } internal static void Replace(this Body body, string oldValue, IEnumerable newValues, StringComparison comparisonType) { if (body is null || string.IsNullOrEmpty(oldValue) || newValues is null) return; - var dict = new Dictionary> { { oldValue, newValues } }; - body.Replace(dict, comparisonType); + body.Replace(new Dictionary> { { oldValue, newValues } }, comparisonType); } #endregion @@ -41,27 +32,29 @@ internal static class MultiReplaceExt internal static void Replace(this Body body, IEnumerable>> replacements, StringComparison comparisonType) { if (body is null || replacements is null) return; - var paragraphs = body.Elements().ToList(); - for (int i = paragraphs.Count - 1; i >= 0; i--) - { - var p = paragraphs[i]; - if (p?.Parent is null) continue; - var newParas = ProcessMultiReplacements(p, replacements, null, comparisonType); - if (newParas is not null && newParas.Count > 0) - ParagraphReplacer.ReplaceParagraph(p, newParas); - } + ReplaceInBody(body, replacements, null, comparisonType); } internal static void Replace(this Body body, IEnumerable>> replacements, StringComparison comparisonType) { if (body is null || replacements is null) return; + ReplaceInBody(body, null, replacements, comparisonType); + } + + private static void ReplaceInBody( + Body body, + IEnumerable>>? stringReplacements, + IEnumerable>>? itemReplacements, + StringComparison comparisonType) + { var paragraphs = body.Elements().ToList(); for (int i = paragraphs.Count - 1; i >= 0; i--) { var p = paragraphs[i]; if (p?.Parent is null) continue; - var newParas = ProcessMultiReplacements(p, null, replacements, comparisonType); - if (newParas is not null && newParas.Count > 0) + + var newParas = ProcessMultiReplacements(p, stringReplacements, itemReplacements, comparisonType); + if (newParas is { Count: > 0 }) ParagraphReplacer.ReplaceParagraph(p, newParas); } } @@ -72,14 +65,13 @@ internal static class MultiReplaceExt internal static bool ReplaceWithMultiple(this Paragraph? paragraph, string oldValue, IEnumerable newValues, StringComparison comparisonType) { - if (paragraph is null || string.IsNullOrEmpty(oldValue) || newValues is null || newValues.Count() == 0) + if (paragraph?.Parent is null || string.IsNullOrEmpty(oldValue) || newValues is null || !newValues.Any()) return false; var dict = new Dictionary> { { oldValue, newValues } }; var newParas = ProcessMultiReplacements(paragraph, dict, null, comparisonType); - if (newParas is null || newParas.Count == 0) return false; - if (paragraph.Parent is not null) + if (newParas is { Count: > 0 }) { ParagraphReplacer.ReplaceParagraph(paragraph, newParas); return true; @@ -89,14 +81,13 @@ internal static class MultiReplaceExt internal static bool ReplaceWithMultiple(this Paragraph? paragraph, string oldValue, IEnumerable newValues, StringComparison comparisonType) { - if (paragraph is null || string.IsNullOrEmpty(oldValue) || newValues is null || newValues.Count() == 0) + if (paragraph?.Parent is null || string.IsNullOrEmpty(oldValue) || newValues is null || !newValues.Any()) return false; var dict = new Dictionary> { { oldValue, newValues } }; var newParas = ProcessMultiReplacements(paragraph, null, dict, comparisonType); - if (newParas is null || newParas.Count == 0) return false; - if (paragraph.Parent is not null) + if (newParas is { Count: > 0 }) { ParagraphReplacer.ReplaceParagraph(paragraph, newParas); return true; @@ -112,26 +103,23 @@ internal static class MultiReplaceExt Paragraph paragraph, IEnumerable>> replacements, StringComparison comparisonType) - { - return ProcessMultiReplacements(paragraph, replacements, null, comparisonType); - } + => ProcessMultiReplacements(paragraph, replacements, null, comparisonType); internal static List? ProcessParagraphWithAllReplacements( Paragraph paragraph, IEnumerable>> replacements, StringComparison comparisonType) - { - return ProcessMultiReplacements(paragraph, null, replacements, comparisonType); - } + => ProcessMultiReplacements(paragraph, null, replacements, comparisonType); internal static List? ProcessParagraphWithAllReplacements( Paragraph paragraph, IEnumerable> replacements, StringComparison comparisonType) { - Dictionary> dict = replacements + var dict = replacements .Where(kvp => !string.IsNullOrEmpty(kvp.Key)) .ToDictionary(kvp => kvp.Key, kvp => (IEnumerable)[kvp.Value]); + return ProcessMultiReplacements(paragraph, dict, null, comparisonType); } @@ -147,9 +135,9 @@ internal static class MultiReplaceExt private class Match { - public MatchDefinition Definition { get; set; } = null!; - public int Start { get; set; } - public int End { get; set; } + public MatchDefinition Definition { get; init; } = null!; + public int Start { get; init; } + public int End { get; init; } } private class RunSegment(Run run, string text, int start, int end) @@ -168,13 +156,15 @@ internal static class MultiReplaceExt private static ParagraphStructure AnalyzeParagraphStructure(List runs) { - var segments = new List(); + var segments = new List(runs.Count); var sb = new StringBuilder(); int pos = 0; + foreach (var run in runs) { string text = GetRunText(run); if (string.IsNullOrEmpty(text)) continue; + segments.Add(new RunSegment(run, text, pos, pos + text.Length)); sb.Append(text); pos += text.Length; @@ -194,16 +184,18 @@ internal static class MultiReplaceExt private static Paragraph CloneParagraphWithoutSection(Paragraph original) { var newPara = new Paragraph(); - if (original.ParagraphProperties is not null) + if (original.ParagraphProperties is null) return newPara; + + var newProps = new ParagraphProperties(); + foreach (var child in original.ParagraphProperties.ChildElements) { - var newProps = new ParagraphProperties(); - foreach (var child in original.ParagraphProperties.ChildElements) - { - if (child is not SectionProperties && child is not PageBreakBefore) - newProps.AppendChild(child.CloneNode(true)); - } - newPara.ParagraphProperties = newProps; + if (child is not SectionProperties and not PageBreakBefore) + newProps.AppendChild(child.CloneNode(true)); } + + if (newProps.HasChildren) + newPara.ParagraphProperties = newProps; + return newPara; } @@ -215,25 +207,26 @@ internal static class MultiReplaceExt foreach (var seg in structure.Segments) { if (seg.End <= position) continue; + if (seg.Start >= position) { newPara.AppendChild(seg.Run.CloneNode(true)); } - else if (seg.End > position) + else { var runClone = (Run)seg.Run.CloneNode(true); - foreach (var t in runClone.Elements().ToList()) t.Remove(); + runClone.RemoveAllChildren(); // Упрощенная очистка + int offset = position - seg.Start; - string newText = seg.Text.Substring(offset); - runClone.AppendChild(new Text(newText)); + runClone.AppendChild(new Text(seg.Text.Substring(offset))); newPara.AppendChild(runClone); } } - foreach (var run in newPara.Descendants().Where(r => !r.HasChildren).ToList()) - run.Remove(); - if (!newPara.ChildElements.OfType().Any() && newPara.ParagraphProperties is null) - return null; - return newPara; + + // Удаляем пустые Run-ы без вложений + newPara.Elements().Where(r => !r.HasChildren).ToList().ForEach(r => r.Remove()); + + return !newPara.Elements().Any() && newPara.ParagraphProperties is null ? null : newPara; } private static void InsertFormattedRun(Paragraph para, ReplaceItem item, ParagraphStructure structure, int position) @@ -244,45 +237,40 @@ internal static class MultiReplaceExt var textRun = new Run(); if (seg.Run.RunProperties is not null) textRun.RunProperties = (RunProperties)seg.Run.RunProperties.CloneNode(true); + textRun.AppendChild(new Text(item.Text ?? string.Empty)); para.AppendChild(textRun); } /// /// Добавляет SectionProperties к параграфу. Все значения (PageSize, PageMargin) берутся из документа. - /// Для книжных секций (addPageSize=false) Orient не устанавливается (not set). /// - private static void AddSectionProperties(Paragraph para, PageBreakType splitValue, bool addPageSize, SectionProperties sourceSection, SectionProperties portraitSection) + private static void AddSectionProperties(Paragraph para, PageBreakType splitValue, bool addPageSize, SectionProperties? sourceSection, SectionProperties? portraitSection) { if (para is null) return; - // Удаляем существующие секции + // Удаляем существующие секции и разрывы if (para.ParagraphProperties is not null) { - var sections = para.ParagraphProperties.Elements().ToList(); - foreach (var sec in sections) sec.Remove(); - var pageBreaks = para.ParagraphProperties.Elements().ToList(); - foreach (var pb in pageBreaks) pb.Remove(); + para.ParagraphProperties.RemoveAllChildren(); + para.ParagraphProperties.RemoveAllChildren(); } para.ParagraphProperties ??= new ParagraphProperties(); var sectionProps = new SectionProperties(); // Добавляем PageSize - SectionProperties? sizeSource = addPageSize ? sourceSection : portraitSection; - var sourcePageSize = sizeSource?.GetFirstChild(); - if (sourcePageSize is null && portraitSection is not null) - sourcePageSize = portraitSection.GetFirstChild(); - if (sourcePageSize is null && sourceSection is not null) - sourcePageSize = sourceSection.GetFirstChild(); + var sizeSource = addPageSize ? sourceSection : portraitSection; + var sourcePageSize = sizeSource?.GetFirstChild() + ?? portraitSection?.GetFirstChild() + ?? sourceSection?.GetFirstChild(); if (sourcePageSize is not null) { var pageSizeClone = (PageSize)sourcePageSize.CloneNode(true); bool sourceIsLandscape = pageSizeClone.Orient?.Value == PageOrientationValues.Landscape || - (pageSizeClone.Width?.Value > pageSizeClone.Height?.Value); - - bool targetIsLandscape = (addPageSize && splitValue == PageBreakType.NewLandscapeSection); + pageSizeClone.Width?.Value > pageSizeClone.Height?.Value; + bool targetIsLandscape = addPageSize && splitValue == PageBreakType.NewLandscapeSection; if (targetIsLandscape && !sourceIsLandscape) { @@ -292,19 +280,11 @@ internal static class MultiReplaceExt else if (!targetIsLandscape && sourceIsLandscape) { pageSizeClone.SwapValues(); - if (addPageSize) - pageSizeClone.Orient = PageOrientationValues.Portrait; - else - pageSizeClone.Orient = null; // не задаём Orient (not set) + pageSizeClone.Orient = addPageSize ? PageOrientationValues.Portrait : null; } else { - if (targetIsLandscape) - pageSizeClone.Orient = PageOrientationValues.Landscape; - else if (addPageSize) - pageSizeClone.Orient = PageOrientationValues.Portrait; - else - pageSizeClone.Orient = null; // not set + pageSizeClone.Orient = targetIsLandscape ? PageOrientationValues.Landscape : (addPageSize ? PageOrientationValues.Portrait : null); } sectionProps.AppendChild(pageSizeClone); } @@ -313,27 +293,24 @@ internal static class MultiReplaceExt PageMargin? marginToUse = null; if (addPageSize) { - var sourceMargin = sourceSection?.GetFirstChild() - ?? portraitSection?.GetFirstChild(); + var sourceMargin = sourceSection?.GetFirstChild() ?? portraitSection?.GetFirstChild(); if (sourceMargin is not null) { var marginClone = (PageMargin)sourceMargin.CloneNode(true); - var sourceOrient = sourceSection?.GetFirstChild()?.Orient; - bool sourceIsLandscape = sourceOrient?.Value == PageOrientationValues.Landscape || - (sourceSection?.GetFirstChild()?.Width?.Value > sourceSection?.GetFirstChild()?.Height?.Value); - if ((splitValue == PageBreakType.NewLandscapeSection && !sourceIsLandscape) || - (splitValue == PageBreakType.NewPortraitSection && sourceIsLandscape)) + var sourceIsLndscape = sourceSection?.GetFirstChild()?.Orient?.Value == PageOrientationValues.Landscape || + sourceSection?.GetFirstChild()?.Width?.Value > sourceSection?.GetFirstChild()?.Height?.Value; + + if ((splitValue == PageBreakType.NewLandscapeSection && !sourceIsLndscape) || + (splitValue == PageBreakType.NewPortraitSection && sourceIsLndscape)) { marginClone.SwapBottomRight(); } marginToUse = marginClone; } } - else + else if (portraitSection?.GetFirstChild() is { } portraitMargin) { - var portraitMargin = portraitSection?.GetFirstChild(); - if (portraitMargin is not null) - marginToUse = (PageMargin)portraitMargin.CloneNode(true); + marginToUse = (PageMargin)portraitMargin.CloneNode(true); } if (marginToUse is not null) @@ -343,62 +320,6 @@ internal static class MultiReplaceExt para.ParagraphProperties.AppendChild(sectionProps); } - private static void MergeParagraph(Paragraph target, Paragraph source) - { - foreach (var child in source.ChildElements) - target.AppendChild(child.CloneNode(true)); - } - - /// Выводит структуру документа: для каждого параграфа показывает текст, наличие секции, ориентацию, размеры и поля. - private static void LogDocumentStructure(Body body, string title) - { -#if DEBUG - Debugger.Builder.AppendLine($"=== {title} ==="); - var paragraphs = body.Descendants().ToList(); - int index = 0; - foreach (var para in paragraphs) - { - var text = para.InnerText.Replace("\n", "\\n").Replace("\r", "\\r"); - var section = para.ParagraphProperties?.GetFirstChild(); - string sectionInfo = "None"; - if (section is not null) - { - var pageSize = section.GetFirstChild(); - string orient = pageSize?.Orient?.ToString() ?? "not set"; - string sizeInfo = ""; - if (pageSize is not null) - { - sizeInfo = $" Size: W={pageSize.Width?.Value}, H={pageSize.Height?.Value}"; - } - var margins = section.GetFirstChild(); - string marginInfo = ""; - if (margins is not null) - { - marginInfo = $" Margins: Top={margins.Top?.Value}, Bottom={margins.Bottom?.Value}, Left={margins.Left?.Value}, Right={margins.Right?.Value}"; - } - sectionInfo = $"Orient={orient}{sizeInfo}{marginInfo}"; - } - Debugger.Builder.AppendLine($" Para {index}: Text='{text}', Section={sectionInfo}"); - index++; - } - - // Логируем секции из Body (если есть) - var bodySections = body.Elements().ToList(); - if (bodySections.Any()) - { - Debugger.Builder.AppendLine(" Body SectionProperties:"); - foreach (var sec in bodySections) - { - var ps = sec.GetFirstChild(); - var pm = sec.GetFirstChild(); - Debugger.Builder.AppendLine($" PageSize: Width={ps?.Width}, Height={ps?.Height}, Orient={ps?.Orient}"); - Debugger.Builder.AppendLine($" PageMargin: Top={pm?.Top}, Bottom={pm?.Bottom}, Left={pm?.Left}, Right={pm?.Right}"); - } - } - Debugger.Builder.AppendLine($"=== END {title} ==="); -#endif - } - /// Основной алгоритм множественной замены с поддержкой разрывов и смены ориентации. private static List? ProcessMultiReplacements( Paragraph original, @@ -406,83 +327,61 @@ internal static class MultiReplaceExt IEnumerable>>? itemReplacements, StringComparison comparisonType) { - var body = original.Ancestors().FirstOrDefault(); - - // 1. Сбор определений var definitions = new List(); + if (stringReplacements is not null) { - foreach (var kvp in stringReplacements) - { - if (string.IsNullOrEmpty(kvp.Key) || kvp.Value is null || kvp.Value.Count() == 0) continue; - var items = kvp.Value.Select(v => new ReplaceItem(v, PageBreakType.None)); - definitions.Add(new MatchDefinition(kvp.Key, items)); - } + definitions.AddRange(stringReplacements + .Where(kvp => !string.IsNullOrEmpty(kvp.Key) && kvp.Value != null && kvp.Value.Any()) + .Select(kvp => new MatchDefinition(kvp.Key, kvp.Value.Select(v => new ReplaceItem(v, PageBreakType.None))))); } + if (itemReplacements is not null) { - foreach (var kvp in itemReplacements) - { - if (string.IsNullOrEmpty(kvp.Key) || kvp.Value is null || kvp.Value.Count() == 0) continue; - definitions.Add(new MatchDefinition(kvp.Key, kvp.Value)); - } + definitions.AddRange(itemReplacements + .Where(kvp => !string.IsNullOrEmpty(kvp.Key) && kvp.Value != null && kvp.Value.Any()) + .Select(kvp => new MatchDefinition(kvp.Key, kvp.Value))); } + if (definitions.Count == 0) return null; - // 2. Анализ структуры параграфа - var runs = original.Descendants().ToList(); + var runs = original.Elements().ToList(); if (runs.Count == 0) return null; + var structure = AnalyzeParagraphStructure(runs); string fullText = structure.FullText; if (fullText.Length == 0) return null; - // 3. Поиск всех вхождений var matches = new List(); foreach (var def in definitions) { int pos = 0; while ((pos = fullText.IndexOf(def.Key, pos, comparisonType)) != -1) { - matches.Add(new Match - { - Definition = def, - Start = pos, - End = pos + def.Key.Length - }); + matches.Add(new Match { Definition = def, Start = pos, End = pos + def.Key.Length }); pos += def.Key.Length; } } + if (matches.Count == 0) return null; matches.Sort((a, b) => a.Start.CompareTo(b.Start)); - // 4. Получаем исходную секцию для копирования (из original или из документа) - SectionProperties? sourceSection = original.ParagraphProperties?.GetFirstChild()?.CloneNode(true) as SectionProperties; - if (sourceSection is null && body is not null) - { - sourceSection = body.Elements().LastOrDefault()?.CloneNode(true) as SectionProperties; - } - sourceSection ??= new SectionProperties(); + var body = original.Ancestors().FirstOrDefault(); + var sourceSection = original.ParagraphProperties?.GetFirstChild()?.CloneNode(true) as SectionProperties + ?? body?.Elements().LastOrDefault()?.CloneNode(true) as SectionProperties + ?? new SectionProperties(); - // Получаем книжную секцию для копирования полей (из документа) - SectionProperties? portraitSection = null; - if (body is not null) - { - portraitSection = body.Elements().FirstOrDefault()?.CloneNode(true) as SectionProperties; - } - portraitSection ??= new SectionProperties(); + var portraitSection = body?.Elements().FirstOrDefault()?.CloneNode(true) as SectionProperties + ?? new SectionProperties(); - // 5. Построение результата var resultParas = new List(); Paragraph? currentPara = null; int currentPos = 0; bool sectionChangeInsideGroup = false; PageBreakType? lastOrientation = null; - for (int i = 0; i < matches.Count; i++) + foreach (var match in matches) { - var match = matches[i]; - - // Текст перед совпадением (если есть) if (currentPos < match.Start) { var beforePara = CloneParagraphWithoutSection(original); @@ -490,6 +389,7 @@ internal static class MultiReplaceExt { if (seg.End <= currentPos) continue; if (seg.Start >= match.Start) break; + if (seg.Start >= currentPos && seg.End <= match.Start) { beforePara.AppendChild(seg.Run.CloneNode(true)); @@ -498,14 +398,14 @@ internal static class MultiReplaceExt { int startOffset = Math.Max(0, currentPos - seg.Start); int endOffset = Math.Min(seg.Text.Length, match.Start - seg.Start); + var runClone = (Run)seg.Run.CloneNode(true); - foreach (var t in runClone.Elements().ToList()) t.Remove(); - string textPart = seg.Text.Substring(startOffset, endOffset - startOffset); - runClone.AppendChild(new Text(textPart)); + runClone.RemoveAllChildren(); + runClone.AppendChild(new Text(seg.Text.Substring(startOffset, endOffset - startOffset))); beforePara.AppendChild(runClone); } } - if (beforePara.ChildElements.OfType().Any()) + if (beforePara.Elements().Any()) { resultParas.Add(beforePara); currentPara = beforePara; @@ -518,23 +418,16 @@ internal static class MultiReplaceExt for (int vIdx = 0; vIdx < values.Count; vIdx++) { var item = values[vIdx]; - - // Создаём новый параграф для каждого элемента - var newPara = CloneParagraphWithoutSection(original); - resultParas.Add(newPara); - currentPara = newPara; + currentPara = CloneParagraphWithoutSection(original); + resultParas.Add(currentPara); InsertFormattedRun(currentPara, item, structure, match.Start); - // Обработка смены ориентации - if (item.SplitValue == PageBreakType.NewLandscapeSection || item.SplitValue == PageBreakType.NewPortraitSection) + if (item.SplitValue is PageBreakType.NewLandscapeSection or PageBreakType.NewPortraitSection) { - bool addPageSize = (vIdx != 0); - PageBreakType orientation = item.SplitValue; - if (vIdx != 0) - { - orientation = PageBreakType.NewLandscapeSection; - } + bool addPageSize = vIdx != 0; + var orientation = vIdx != 0 ? PageBreakType.NewLandscapeSection : item.SplitValue; + AddSectionProperties(currentPara, orientation, addPageSize, sourceSection, portraitSection); lastOrientation = item.SplitValue; sectionChangeInsideGroup = true; @@ -543,110 +436,61 @@ internal static class MultiReplaceExt { var seg = structure.Segments.FirstOrDefault(s => match.Start >= s.Start && match.Start < s.End); var breakRun = new Run(new Break { Type = BreakValues.Page }); - if (seg is not null && seg.Run.RunProperties is not null) + if (seg?.Run.RunProperties is not null) breakRun.RunProperties = (RunProperties)seg.Run.RunProperties.CloneNode(true); currentPara.AppendChild(breakRun); } } - // Закрываем секцию, если была смена и последний параграф не имеет секции - if (sectionChangeInsideGroup && lastOrientation.HasValue && currentPara is not null) + if (sectionChangeInsideGroup && lastOrientation.HasValue && currentPara?.ParagraphProperties?.GetFirstChild() is null) { - if (currentPara.ParagraphProperties?.GetFirstChild() is null) - { - bool addPageSize = (lastOrientation.Value == PageBreakType.NewLandscapeSection); - AddSectionProperties(currentPara, lastOrientation.Value, addPageSize, sourceSection, portraitSection); - } + AddSectionProperties(currentPara!, lastOrientation.Value, lastOrientation.Value == PageBreakType.NewLandscapeSection, sourceSection, portraitSection); } - // Если исходная секция была landscape, внутри группы была смена, и последняя ориентация — книжная, - // добавляем landscape секцию в Body, чтобы остаток остался landscape. - if (body is not null) + if (body is not null && sourceSection.GetFirstChild() is { } sourcePageSize) { - var sourcePageSize = sourceSection.GetFirstChild(); - if (sourcePageSize is not null) + bool sourceIsLandscape = sourcePageSize.Orient?.Value == PageOrientationValues.Landscape || sourcePageSize.Width?.Value > sourcePageSize.Height?.Value; + bool lastIsPortrait = lastOrientation == PageBreakType.NewPortraitSection; + + if (sourceIsLandscape && sectionChangeInsideGroup && lastIsPortrait && !body.Elements().Any(s => s.GetFirstChild()?.Orient?.Value == PageOrientationValues.Landscape)) { - bool sourceIsLandscape = sourcePageSize.Orient?.Value == PageOrientationValues.Landscape || - (sourcePageSize.Width?.Value > sourcePageSize.Height?.Value); - bool lastIsPortrait = lastOrientation.HasValue && lastOrientation.Value == PageBreakType.NewPortraitSection; - if (sourceIsLandscape && sectionChangeInsideGroup && lastIsPortrait) + var bodySection = new SectionProperties(); + var pageSizeClone = (PageSize)sourcePageSize.CloneNode(true); + + if (pageSizeClone.Orient?.Value != PageOrientationValues.Landscape) { - // Проверяем, есть ли уже секция landscape на Body - bool hasBodyLandscape = false; - foreach (var bodySec in body.Elements()) - { - var ps = bodySec.GetFirstChild(); - if (ps is not null && ps.Orient?.Value == PageOrientationValues.Landscape) - { - hasBodyLandscape = true; - break; - } - } - if (!hasBodyLandscape) - { - // Создаём секцию landscape для Body - var bodySection = new SectionProperties(); - var pageSizeClone = (PageSize)sourcePageSize.CloneNode(true); - // Если ориентация не landscape, меняем - if (pageSizeClone.Orient?.Value != PageOrientationValues.Landscape) - { - pageSizeClone.SwapValues(); - pageSizeClone.Orient = PageOrientationValues.Landscape; - } - bodySection.AppendChild(pageSizeClone); - var sourceMargin = sourceSection.GetFirstChild(); - if (sourceMargin is not null) - { - var marginClone = (PageMargin)sourceMargin.CloneNode(true); - // Если исходная секция не landscape, но мы делаем landscape, меняем поля - if (sourceSection.GetFirstChild()?.Orient?.Value != PageOrientationValues.Landscape) - { - marginClone.SwapBottomRight(); - } - bodySection.AppendChild(marginClone); - } - bodySection.AppendChild(new SectionType { Val = SectionMarkValues.NextPage }); - body.AppendChild(bodySection); - } + pageSizeClone.SwapValues(); + pageSizeClone.Orient = PageOrientationValues.Landscape; } + bodySection.AppendChild(pageSizeClone); + + if (sourceSection.GetFirstChild() is { } sourceMargin) + { + var marginClone = (PageMargin)sourceMargin.CloneNode(true); + if (sourceSection.GetFirstChild()?.Orient?.Value != PageOrientationValues.Landscape) + { + marginClone.SwapBottomRight(); + } + bodySection.AppendChild(marginClone); + } + bodySection.AppendChild(new SectionType { Val = SectionMarkValues.NextPage }); + body.AppendChild(bodySection); } } - currentPos = match.End; } - // 6. Обработка остатка текста (если есть) - if (currentPos < fullText.Length) + if (currentPos < fullText.Length && BuildRemainderParagraph(original, structure, currentPos) is { } remainderPara) { - var remainderPara = BuildRemainderParagraph(original, structure, currentPos); - if (remainderPara is not null) + if (sectionChangeInsideGroup && lastOrientation.HasValue) { - // Если внутри группы была смена, применяем последнюю ориентацию к остатку - if (sectionChangeInsideGroup && lastOrientation.HasValue) - { - var breakRun = new Run(new Break { Type = BreakValues.Page }); - remainderPara.InsertAt(breakRun, 0); - bool addPageSize = (lastOrientation.Value == PageBreakType.NewLandscapeSection); - AddSectionProperties(remainderPara, lastOrientation.Value, addPageSize, sourceSection, portraitSection); - } - resultParas.Add(remainderPara); + remainderPara.InsertAt(new Run(new Break { Type = BreakValues.Page }), 0); + AddSectionProperties(remainderPara, lastOrientation.Value, lastOrientation.Value == PageBreakType.NewLandscapeSection, sourceSection, portraitSection); } + resultParas.Add(remainderPara); } - // 7. Очистка пустых параграфов - for (int i = resultParas.Count - 1; i >= 0; i--) - { - var p = resultParas[i]; - if (!p.ChildElements.OfType().Any() && p.ParagraphProperties is null) - resultParas.RemoveAt(i); - } - - // Логирование -#if DEBUG - if (body is not null) - LogDocumentStructure(body, "FINAL DOCUMENT STRUCTURE"); -#endif - + resultParas.RemoveAll(p => !p.Elements().Any() && p.ParagraphProperties is null); return resultParas.Count > 0 ? resultParas : null; } } \ No newline at end of file