ICellText rename

.gitea/workflows/publish.yml

@@ -0,0 +1,38 @@
+name: Publish NuGet packages
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  publish:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.x'
+
+      - name: Get version from tag
+        shell: pwsh
+        run: |
+          $tag = "$env:GITHUB_REF_NAME"
+          $version = $tag -replace '^v', ''
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+      - name: Pack ExcelProcessor
+        run: dotnet pack QWERTYkez.ExcelProcessor/QWERTYkez.ExcelProcessor.csproj -c Release -o ./packages -p:Version=${{ env.VERSION }}
+
+      - name: Pack WordProcessor
+        run: dotnet pack QWERTYkez.WordProcessor/QWERTYkez.WordProcessor.csproj -c Release -o ./packages -p:Version=${{ env.VERSION }}
+
+      - name: Push to Gitea
+        shell: pwsh
+        run: |
+          Get-ChildItem -Path ./packages -Filter *.nupkg | ForEach-Object {
+            dotnet nuget push $_.FullName --source https://lancool.qwertykez.fun/api/packages/QWERTYkez/nuget --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate
+          }

QWERTYkez.ExcelProcessor/Editors/ExcelCell.cs

@@ -445,7 +445,7 @@ internal sealed class ExcelCell : ICell
                     // Преобразуем RunProperties в RunFormat (можно вынести в отдельный метод)
                     format = RunFormat.FromRunProperties(run.RunProperties);
                 }
-                textObj.AddRun(text, format);
+                textObj.Run(text, format);
             }
             return textObj;
         }

QWERTYkez.ExcelProcessor/Editors/ExcelCellText.cs

@@ -94,7 +94,7 @@ internal sealed class ExcelCellText : ICellText
     }
 
     /// <inheritdoc />
-    public ICellText AddBreak()
+    public ICellText Break()
     {
         // Добавляем символ переноса строки в последний существующий Run
         if (_runs != null && _runs.Count > 0)
@@ -105,13 +105,13 @@ internal sealed class ExcelCellText : ICellText
         else
         {
             // Если нет ни одного Run, создаём новый с символом переноса
-            AddRun("\n", null);
+            Run("\n", null);
         }
         return this;
     }
 
     /// <inheritdoc />
-    public ICellText AddRun(string text, RunFormat? format = null)
+    public ICellText Run(string text, RunFormat? format = null)
     {
         if (string.IsNullOrEmpty(text))
             return this;
@@ -122,15 +122,15 @@ internal sealed class ExcelCellText : ICellText
     }
 
     /// <inheritdoc />
-    public ICellText AddRunBreak(string text, RunFormat? format = null)
+    public ICellText RunBreak(string text, RunFormat? format = null)
     {
-        AddRun(text, format);
-        AddBreak();
+        Run(text, format);
+        Break();
         return this;
     }
 
     /// <inheritdoc />
-    public ICellText AddSubRun(string text, RunFormat? format = null)
+    public ICellText Sub(string text, RunFormat? format = null)
     {
         var subFormat = format is { } fmt
             ? new RunFormat
@@ -145,11 +145,11 @@ internal sealed class ExcelCellText : ICellText
                 Vertical = VerticalTextRunAlignment.Subscript
             }
             : new RunFormat { Vertical = VerticalTextRunAlignment.Subscript };
-        return AddRun(text, subFormat);
+        return Run(text, subFormat);
     }
 
     /// <inheritdoc />
-    public ICellText AddSupRun(string text, RunFormat? format = null)
+    public ICellText Sup(string text, RunFormat? format = null)
     {
         var supFormat = format is { } fmt
             ? new RunFormat
@@ -164,7 +164,7 @@ internal sealed class ExcelCellText : ICellText
                 Vertical = VerticalTextRunAlignment.Subscript
             }
             : new RunFormat { Vertical = VerticalTextRunAlignment.Superscript };
-        return AddRun(text, supFormat);
+        return Run(text, supFormat);
     }
 
     /// <inheritdoc />
@@ -186,14 +186,14 @@ internal sealed class ExcelCellText : ICellText
         if (!TryInsertRun(index, text, format))
             return false;
         // После вставленного run добавляем break на следующей позиции
-        AddBreak();
+        Break();
         // Сдвигаем? Просто добавляем break в конец – неверно. Break должен быть сразу после вставленного.
         // Но AddBreak добавляет в конец. Нужно вставить break на index+1.
         return TryInsertRun(index + 1, "\n", null);
     }
 
     /// <inheritdoc />
-    public bool TryInsertSubRun(int index, string text, RunFormat? format = null)
+    public bool TryInsertSub(int index, string text, RunFormat? format = null)
     {
         var subFormat = format is { } fmt
             ? new RunFormat
@@ -212,7 +212,7 @@ internal sealed class ExcelCellText : ICellText
     }
 
     /// <inheritdoc />
-    public bool TryInsertSupRun(int index, string text, RunFormat? format = null)
+    public bool TryInsertSup(int index, string text, RunFormat? format = null)
     {
         var supFormat = format is { } fmt
             ? new RunFormat

QWERTYkez.ExcelProcessor/Editors/Interfaces.cs

@@ -779,19 +779,19 @@ public interface ICellText
     bool TryRemoveRun(int index, out IRun? removed);
 
     /// <summary>Добавляет разрыв строки (перенос внутри ячейки).</summary>
-    ICellText AddBreak();
+    ICellText Break();
 
     /// <summary>Добавляет обычный текстовый фрагмент.</summary>
-    ICellText AddRun(string text, RunFormat? format = null);
+    ICellText Run(string text, RunFormat? format = null);
 
     /// <summary>Добавляет фрагмент с последующим разрывом строки.</summary>
-    ICellText AddRunBreak(string text, RunFormat? format = null);
+    ICellText RunBreak(string text, RunFormat? format = null);
 
     /// <summary>Добавляет подстрочный фрагмент (эквивалентно AddRun с Vertical = Subscript).</summary>
-    ICellText AddSubRun(string text, RunFormat? format = null);
+    ICellText Sub(string text, RunFormat? format = null);
 
     /// <summary>Добавляет надстрочный фрагмент.</summary>
-    ICellText AddSupRun(string text, RunFormat? format = null);
+    ICellText Sup(string text, RunFormat? format = null);
 
     /// <summary>Вставляет фрагмент по индексу.</summary>
     bool TryInsertRun(int index, string text, RunFormat? format = null);
@@ -800,10 +800,10 @@ public interface ICellText
     bool TryInsertRunBreak(int index, string text, RunFormat? format = null);
 
     /// <summary>Вставляет подстрочный фрагмент по индексу.</summary>
-    bool TryInsertSubRun(int index, string text, RunFormat? format = null);
+    bool TryInsertSub(int index, string text, RunFormat? format = null);
 
     /// <summary>Вставляет надстрочный фрагмент по индексу.</summary>
-    bool TryInsertSupRun(int index, string text, RunFormat? format = null);
+    bool TryInsertSup(int index, string text, RunFormat? format = null);
 
     /// <summary>Применяет заданный формат ко всем существующим фрагментам (поверх их текущего форматирования, заменяя неуказанные свойства).</summary>
     void ApplyFormatToAllRuns(RunFormat format);

QWERTYkez.WordProcessor/Builders/FormulaHelper.cs

@@ -1,21 +1,21 @@
-using Base = DocumentFormat.OpenXml.Math.Base;
-using ControlProperties = DocumentFormat.OpenXml.Math.ControlProperties;
-using Degree = DocumentFormat.OpenXml.Math.Degree;
-using Denominator = DocumentFormat.OpenXml.Math.Denominator;
-using Fraction = DocumentFormat.OpenXml.Math.Fraction;
-using FractionProperties = DocumentFormat.OpenXml.Math.FractionProperties;
-using HideDegree = DocumentFormat.OpenXml.Math.HideDegree;
+using MathBase = DocumentFormat.OpenXml.Math.Base;
+using MathControlProperties = DocumentFormat.OpenXml.Math.ControlProperties;
+using MathDegree = DocumentFormat.OpenXml.Math.Degree;
+using MathDenominator = DocumentFormat.OpenXml.Math.Denominator;
+using MathFraction = DocumentFormat.OpenXml.Math.Fraction;
+using MathFractionProperties = DocumentFormat.OpenXml.Math.FractionProperties;
+using MathHideDegree = DocumentFormat.OpenXml.Math.HideDegree;
 using MathRun = DocumentFormat.OpenXml.Math.Run;
 using MathRunProperties = DocumentFormat.OpenXml.Math.RunProperties;
 using MathText = DocumentFormat.OpenXml.Math.Text;
-using Numerator = DocumentFormat.OpenXml.Math.Numerator;
-using Radical = DocumentFormat.OpenXml.Math.Radical;
-using RadicalProperties = DocumentFormat.OpenXml.Math.RadicalProperties;
-using SubArgument = DocumentFormat.OpenXml.Math.SubArgument;
-using Subscript = DocumentFormat.OpenXml.Math.Subscript;
-using SubSuperscript = DocumentFormat.OpenXml.Math.SubSuperscript;
-using SuperArgument = DocumentFormat.OpenXml.Math.SuperArgument;
-using Superscript = DocumentFormat.OpenXml.Math.Superscript;
+using MathNumerator = DocumentFormat.OpenXml.Math.Numerator;
+using MathRadical = DocumentFormat.OpenXml.Math.Radical;
+using MathRadicalProperties = DocumentFormat.OpenXml.Math.RadicalProperties;
+using MathSubArgument = DocumentFormat.OpenXml.Math.SubArgument;
+using MathSubscript = DocumentFormat.OpenXml.Math.Subscript;
+using MathSubSuperscript = DocumentFormat.OpenXml.Math.SubSuperscript;
+using MathSuperArgument = DocumentFormat.OpenXml.Math.SuperArgument;
+using MathSuperscript = DocumentFormat.OpenXml.Math.Superscript;
 
 namespace QWERTYkez.WordProcessor;
 
@@ -59,19 +59,19 @@ internal static class FormulaHelper
         }
     }
 
-    public static Fraction CreateFraction(
+    public static MathFraction CreateFraction(
         Action<IFormula> numeratorBuilder,
         Action<IFormula> denominatorBuilder,
         IFormula builder)
     {
-        var fraction = new Fraction();
+        var fraction = new MathFraction();
         var font = builder.BaseFont;
 
         // Добавляем свойства дроби с форматированием (для черты дроби)
-        var fPr = new FractionProperties();
+        var fPr = new MathFractionProperties();
         if (font.TryExtractWithoutFamily(out var wordElements))
         {
-            var ctrlPr = new ControlProperties();
+            var ctrlPr = new MathControlProperties();
             var rPr = new RunProperties();
             foreach (var elem in wordElements)
                 rPr.AppendChild(elem.CloneNode(true));
@@ -82,14 +82,14 @@ internal static class FormulaHelper
         fraction.AppendChild(fPr);
 
         // Числитель
-        var numeratorElem = new Numerator();
+        var numeratorElem = new MathNumerator();
         fraction.AppendChild(numeratorElem);
         builder.PushContext(numeratorElem);
         numeratorBuilder(builder);
         builder.PopContext();
 
         // Знаменатель
-        var denominatorElem = new Denominator();
+        var denominatorElem = new MathDenominator();
         fraction.AppendChild(denominatorElem);
         builder.PushContext(denominatorElem);
         denominatorBuilder(builder);
@@ -98,20 +98,20 @@ internal static class FormulaHelper
         return fraction;
     }
 
-    public static Radical CreateRadical(
+    public static MathRadical CreateRadical(
     Action<IFormula> radicandBuilder,
     Action<IFormula>? degreeBuilder,
     IFormula builder)
     {
-        var radical = new Radical();
+        var radical = new MathRadical();
         var font = builder.BaseFont;
 
-        var radPr = new RadicalProperties();
+        var radPr = new MathRadicalProperties();
 
         // Цвет, размер и подчёркивание для знака корня (ControlProperties)
         if (font is not null && font.TryExtractWithoutFamily(out var wordElements))
         {
-            var ctrlPr = new ControlProperties();
+            var ctrlPr = new MathControlProperties();
             var rPr = new RunProperties();
             foreach (var elem in wordElements)
                 rPr.AppendChild(elem.CloneNode(true));
@@ -123,7 +123,7 @@ internal static class FormulaHelper
         // Если степень не задана, скрываем её
         if (degreeBuilder is null)
         {
-            radPr.HideDegree = new HideDegree { Val = DocumentFormat.OpenXml.Math.BooleanValues.One };
+            radPr.HideDegree = new MathHideDegree { Val = DocumentFormat.OpenXml.Math.BooleanValues.One };
         }
 
         // Добавляем свойства радикала (с цветом)
@@ -132,7 +132,7 @@ internal static class FormulaHelper
         // Степень (если есть)
         if (degreeBuilder is not null)
         {
-            var degree = new Degree();
+            var degree = new MathDegree();
             radical.AppendChild(degree);
             builder.PushContext(degree);
             degreeBuilder(builder);
@@ -140,7 +140,7 @@ internal static class FormulaHelper
         }
 
         // Подкоренное выражение
-        var radicand = new Base();
+        var radicand = new MathBase();
         radical.AppendChild(radicand);
         builder.PushContext(radicand);
         radicandBuilder(builder);
@@ -179,10 +179,10 @@ internal static class FormulaHelper
         }
         else
         {
-            var integralWithLimits = new SubSuperscript();
+            var integralWithLimits = new MathSubSuperscript();
             currentContext.AppendChild(integralWithLimits);
 
-            var baseElem = new Base();
+            var baseElem = new MathBase();
             var integralRun = CreateMathRun(font);
             integralRun.AppendChild(new MathText("∫"));
             baseElem.AppendChild(integralRun);
@@ -190,7 +190,7 @@ internal static class FormulaHelper
 
             if (lowerLimitBuilder is not null)
             {
-                var subArg = new SubArgument();
+                var subArg = new MathSubArgument();
                 integralWithLimits.AppendChild(subArg);
                 builder.PushContext(subArg);
                 lowerLimitBuilder(builder);
@@ -198,7 +198,7 @@ internal static class FormulaHelper
             }
             if (upperLimitBuilder is not null)
             {
-                var superArg = new SuperArgument();
+                var superArg = new MathSuperArgument();
                 integralWithLimits.AppendChild(superArg);
                 builder.PushContext(superArg);
                 upperLimitBuilder(builder);
@@ -242,10 +242,10 @@ internal static class FormulaHelper
         }
         else
         {
-            var sumWithLimits = new SubSuperscript();
+            var sumWithLimits = new MathSubSuperscript();
             currentContext.AppendChild(sumWithLimits);
 
-            var baseElem = new Base();
+            var baseElem = new MathBase();
             var sumRun = CreateMathRun(font);
             sumRun.AppendChild(new MathText("∑"));
             baseElem.AppendChild(sumRun);
@@ -253,7 +253,7 @@ internal static class FormulaHelper
 
             if (lowerLimitBuilder is not null)
             {
-                var subArg = new SubArgument();
+                var subArg = new MathSubArgument();
                 sumWithLimits.AppendChild(subArg);
                 builder.PushContext(subArg);
                 lowerLimitBuilder(builder);
@@ -261,7 +261,7 @@ internal static class FormulaHelper
             }
             if (upperLimitBuilder is not null)
             {
-                var superArg = new SuperArgument();
+                var superArg = new MathSuperArgument();
                 sumWithLimits.AppendChild(superArg);
                 builder.PushContext(superArg);
                 upperLimitBuilder(builder);
@@ -278,22 +278,22 @@ internal static class FormulaHelper
 
 
     /// <summary>Создаёт степень.</summary>
-    public static Superscript CreateSuperscript(
+    public static MathSuperscript CreateSuperscript(
         Action<IFormula> baseBuilder,
         Action<IFormula> supBuilder,
         IFormula builder)
     {
-        var superscript = new Superscript();
+        var superscript = new MathSuperscript();
 
         // Основание
-        var baseElem = new Base();
+        var baseElem = new MathBase();
         superscript.AppendChild(baseElem);
         builder.PushContext(baseElem);
         baseBuilder(builder);
         builder.PopContext();
 
         // Показатель
-        var superArg = new SuperArgument();
+        var superArg = new MathSuperArgument();
         superscript.AppendChild(superArg);
         builder.PushContext(superArg);
         supBuilder(builder);
@@ -303,20 +303,20 @@ internal static class FormulaHelper
     }
 
     /// <summary>Создаёт нижний индекс.</summary>
-    public static Subscript CreateSubscript(
+    public static MathSubscript CreateSubscript(
         Action<IFormula> baseBuilder,
         Action<IFormula> subBuilder,
         IFormula builder)
     {
-        var subscript = new Subscript();
+        var subscript = new MathSubscript();
 
-        var baseElem = new Base();
+        var baseElem = new MathBase();
         subscript.AppendChild(baseElem);
         builder.PushContext(baseElem);
         baseBuilder(builder);
         builder.PopContext();
 
-        var subArg = new SubArgument();
+        var subArg = new MathSubArgument();
         subscript.AppendChild(subArg);
         builder.PushContext(subArg);
         subBuilder(builder);
@@ -326,27 +326,27 @@ internal static class FormulaHelper
     }
 
     /// <summary>Создаёт одновременные нижний и верхний индексы.</summary>
-    public static SubSuperscript CreateSubSuperscript(
+    public static MathSubSuperscript CreateSubSuperscript(
         Action<IFormula> baseBuilder,
         Action<IFormula> subBuilder,
         Action<IFormula> supBuilder,
         IFormula builder)
     {
-        var subSup = new SubSuperscript();
+        var subSup = new MathSubSuperscript();
 
-        var baseElem = new Base();
+        var baseElem = new MathBase();
         subSup.AppendChild(baseElem);
         builder.PushContext(baseElem);
         baseBuilder(builder);
         builder.PopContext();
 
-        var subArg = new SubArgument();
+        var subArg = new MathSubArgument();
         subSup.AppendChild(subArg);
         builder.PushContext(subArg);
         subBuilder(builder);
         builder.PopContext();
 
-        var superArg = new SuperArgument();
+        var superArg = new MathSuperArgument();
         subSup.AppendChild(superArg);
         builder.PushContext(superArg);
         supBuilder(builder);

QWERTYkez.WordProcessor/Builders/ParagraphBuilderBase.cs

@@ -1,4 +1,6 @@
-namespace QWERTYkez.WordProcessor;
+using MathOfficeMath = DocumentFormat.OpenXml.Math.OfficeMath;
+
+namespace QWERTYkez.WordProcessor;
 
 abstract class ParagraphBuilderBase : IParagraph, IFormula
 {
@@ -176,7 +178,7 @@ abstract class ParagraphBuilderBase : IParagraph, IFormula
     // Метод AddFormula для IParagraphBuilder
     IParagraph IParagraph.AddFormula(Action<IFormula> configure)
     {
-        var math = new OfficeMath();
+        var math = new MathOfficeMath();
         try
         {
             _mathContextStack.Push(math);
@@ -196,7 +198,7 @@ abstract class ParagraphBuilderBase : IParagraph, IFormula
     // Метод AddFormula для IParagraphBuilder
     IParagraph IParagraph.AddFormulaBreak(Action<IFormula> configure)
     {
-        var math = new OfficeMath();
+        var math = new MathOfficeMath();
         try
         {
             _mathContextStack.Push(math);