Fix naming conflict

Author: manfromarce

src/DocSharp.Common/Primitives/PageMargins.cs

@@ -1,4 +1,4 @@
-namespace DocSharp;
+namespace DocSharp.Primitives;
 
 public class PageMargins
 {

src/DocSharp.Common/Primitives/PageSize.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace DocSharp;
+namespace DocSharp.Primitives;
 
 public class PageSize
 {

src/DocSharp.Epub/EpubToDocxConverter.cs

@@ -8,10 +8,9 @@
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using DocSharp.Helpers;
-using DocSharp;
+using DocSharp.Primitives;
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
 using W = DocumentFormat.OpenXml.Wordprocessing;
 using EpubCore;
 using HtmlToOpenXml;
@@ -104,9 +103,9 @@ public async Task BuildDocxAsync(Stream input, WordprocessingDocument targetDocu
         {
             // Initialize document
             var mainPart = targetDocument.MainDocumentPart ?? targetDocument.AddMainDocumentPart();
-            mainPart.Document ??= new Document();
+            mainPart.Document ??= new W.Document();
             mainPart.Document.RemoveAllChildren();
-            var body = mainPart.Document.AppendChild(new Body());
+            var body = mainPart.Document.AppendChild(new W.Body());
 
             // Initialize HTML to DOCX converter
             var converter = new HtmlConverter(mainPart)
@@ -152,9 +151,9 @@ public async Task BuildDocxAsync(Stream input, WordprocessingDocument targetDocu
                 // Before each chapter, add a bookmark in DOCX to make internal links work
                 string anchorName = $"_{fileName.Replace(' ', '_')}";
                 int id = new Random().Next(100000, 999999); // TODO: improve id generation
-                body.AppendChild(new Paragraph([
-                    new BookmarkStart() { Name = anchorName, Id = id.ToString() }, 
-                    new BookmarkEnd() { Id = id.ToString() }
+                body.AppendChild(new W.Paragraph([
+                    new W.BookmarkStart() { Name = anchorName, Id = id.ToString() }, 
+                    new W.BookmarkEnd() { Id = id.ToString() }
                 ]));
 
                 // Parse the HTML body, convert to Open XML and append to the DOCX.
@@ -163,18 +162,18 @@ public async Task BuildDocxAsync(Stream input, WordprocessingDocument targetDocu
                 if (PageBreakAfterChapters)
                 {
                     // Add a page break after each chapter if desired.
-                    body.AppendChild(new Paragraph(new Run(new Break() { Type = BreakValues.Page })));
+                    body.AppendChild(new W.Paragraph(new W.Run(new W.Break() { Type = W.BreakValues.Page })));
                 }
             }            
 
             // Add default section properties            
-            body.AppendChild(new SectionProperties(
+            body.AppendChild(new W.SectionProperties(
                 new W.PageSize()
                 {
                     Width = (uint)((PageSize ?? PageSize.Default).WidthTwips()),
                     Height = (uint)((PageSize ?? PageSize.Default).HeightTwips()),
                 },
-                new PageMargin()
+                new W.PageMargin()
                 {
                     // Notes: 
                     // - PageMargin uses uint for Left and Right margins, and int for top and bottom (enforced by Open XML SDK)

src/DocSharp.Markdown/MarkdownConverter.cs

@@ -8,10 +8,9 @@
 using Markdig.Renderers.Docx;
 using Markdig.Renderers.Rtf;
 using DocSharp.Writers;
-using DocSharp;
+using DocSharp.Primitives;
 using System;
 using System.Linq;
-using DocumentFormat.OpenXml.Wordprocessing;
 using W = DocumentFormat.OpenXml.Wordprocessing;
 
 namespace DocSharp.Markdown;
@@ -331,10 +330,10 @@ private void ApplyPageSettingsToDocx(WordprocessingDocument document)
     {
         if (document?.MainDocumentPart == null) return;
 
-        var sect = document.MainDocumentPart.Document.Body.Elements<SectionProperties>().LastOrDefault();
+        var sect = document.MainDocumentPart.Document.Body.Elements<W.SectionProperties>().LastOrDefault();
         if (sect == null)
         {
-            sect = new SectionProperties();
+            sect = new W.SectionProperties();
             document.MainDocumentPart.Document.Body.AppendChild(sect);
         }
 
@@ -353,12 +352,12 @@ private void ApplyPageSettingsToDocx(WordprocessingDocument document)
         // Page margins
         if (PageMargins != null)
         {
-            var pm = sect.GetFirstChild<PageMargin>() ?? new PageMargin();
+            var pm = sect.GetFirstChild<W.PageMargin>() ?? new W.PageMargin();
             pm.Left = (uint)PageMargins.LeftTwips();
             pm.Right = (uint)PageMargins.RightTwips();
             pm.Top = (int)PageMargins.TopTwips();
             pm.Bottom = (int)PageMargins.BottomTwips();
-            if (sect.GetFirstChild<PageMargin>() == null)
+            if (sect.GetFirstChild<W.PageMargin>() == null)
                 sect.AppendChild(pm);
         }
     }