rearrange of content related classes

PdfCraft/API/GraphicsCanvas.cs

@@ -4,8 +4,9 @@
 using System.IO;
 using System.Text;
 using PdfCraft.Constants;
+using PdfCraft.Contents;
+using PdfCraft.Contents.Graphics;
 using PdfCraft.Extensions;
-using PdfCraft.Graphics;
 
 namespace PdfCraft.API
 {

PdfCraft/API/TextBox.cs

@@ -4,9 +4,10 @@
 using System.Linq;
 using System.Text;
 using PdfCraft.Constants;
+using PdfCraft.Contents;
+using PdfCraft.Contents.Text;
 using PdfCraft.Extensions;
 using PdfCraft.Fonts;
-using PdfCraft.Text;
 
 namespace PdfCraft.API
 {

PdfCraft/PdfObjects/ContentsPart.cs → PdfCraft/Contents/ContentsPart.cs

@@ -1,4 +1,4 @@
-namespace PdfCraft
+namespace PdfCraft.Contents
 {
     public abstract class ContentsPart
     {

PdfCraft/Graphics/BoxDefinition.cs → PdfCraft/Contents/Graphics/BoxDefinition.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
 
-namespace PdfCraft.Graphics
+namespace PdfCraft.Contents.Graphics
 {
     public class BoxDefinition
     {

PdfCraft/Graphics/CircleDefinition.cs → PdfCraft/Contents/Graphics/CircleDefinition.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
 
-namespace PdfCraft.Graphics
+namespace PdfCraft.Contents.Graphics
 {
     public class CircleDefinition
     {

PdfCraft/Graphics/Command.cs → PdfCraft/Contents/Graphics/Command.cs

@@ -1,4 +1,4 @@
-namespace PdfCraft.Graphics
+namespace PdfCraft.Contents.Graphics
 {
     public enum Command
     {

PdfCraft/Graphics/GraphicsCommand.cs → PdfCraft/Contents/Graphics/GraphicsCommand.cs

@@ -1,4 +1,4 @@
-namespace PdfCraft.Graphics
+namespace PdfCraft.Contents.Graphics
 {
     internal class GraphicsCommand
     {

PdfCraft/Graphics/ImageType.cs → PdfCraft/Contents/Graphics/ImageType.cs

@@ -1,4 +1,4 @@
-namespace PdfCraft.Graphics
+namespace PdfCraft.Contents.Graphics
 {
     public enum ImageType
     {

PdfCraft/Graphics/LineDefinition.cs → PdfCraft/Contents/Graphics/LineDefinition.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
 
-namespace PdfCraft.Graphics
+namespace PdfCraft.Contents.Graphics
 {
     internal class LineDefinition
     {

PdfCraft/Contents/Graphics/XObject.cs

@@ -0,0 +1,10 @@
+namespace PdfCraft.Contents.Graphics
+{
+    public class XObject : BasePdfObject
+    {
+        public XObject(int objectNumber)
+            : base(objectNumber)
+        {
+        }
+    }
+}

PdfCraft/Text/Command.cs → PdfCraft/Contents/Text/Command.cs

@@ -1,4 +1,4 @@
-namespace PdfCraft.Text
+namespace PdfCraft.Contents.Text
 {
     public enum Command
     {

PdfCraft/Text/TextCommand.cs → PdfCraft/Contents/Text/TextCommand.cs

@@ -1,4 +1,4 @@
-namespace PdfCraft.Text
+namespace PdfCraft.Contents.Text
 {
     public class TextCommand
     {

PdfCraft/Text/WordWrapping.cs → PdfCraft/Contents/Text/WordWrapping.cs

@@ -1,9 +1,8 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using PdfCraft.Fonts;
 
-namespace PdfCraft.Text
+namespace PdfCraft.Contents.Text
 {
     internal class WordWrapping
     {

PdfCraft/PdfCraft.csproj

@@ -45,11 +45,13 @@
     <Compile Include="Extensions\IntExtensions.cs" />
     <Compile Include="Fonts\FontDefinition.cs" />
     <Compile Include="Fonts\FontDescriptor.cs" />
+    <Compile Include="Fonts\FontObject.cs" />
     <Compile Include="Fonts\Fontwidths.cs" />
-    <Compile Include="Graphics\CircleDefinition.cs" />
-    <Compile Include="Graphics\ImageType.cs" />
+    <Compile Include="Contents\Graphics\CircleDefinition.cs" />
+    <Compile Include="Contents\Graphics\ImageType.cs" />
+    <Compile Include="Contents\Graphics\XObject.cs" />
     <Compile Include="PdfGenerator.cs" />
-    <Compile Include="PdfObjects\ContentsPart.cs" />
+    <Compile Include="Contents\ContentsPart.cs" />
     <Compile Include="API\GraphicsCanvas.cs" />
     <Compile Include="API\Document.cs" />
     <Compile Include="API\Page.cs" />
@@ -58,13 +60,12 @@
     <Compile Include="Extensions\PointExtensions.cs" />
     <Compile Include="Extensions\SizeExtensions.cs" />
     <Compile Include="Fonts\FontProperties.cs" />
-    <Compile Include="Fonts\FontObject.cs" />
     <Compile Include="Fonts\FontFactory.cs" />
     <Compile Include="Fonts\Fonts.cs" />
-    <Compile Include="Graphics\BoxDefinition.cs" />
-    <Compile Include="Graphics\Command.cs" />
-    <Compile Include="Graphics\GraphicsCommand.cs" />
-    <Compile Include="Graphics\LineDefinition.cs" />
+    <Compile Include="Contents\Graphics\BoxDefinition.cs" />
+    <Compile Include="Contents\Graphics\Command.cs" />
+    <Compile Include="Contents\Graphics\GraphicsCommand.cs" />
+    <Compile Include="Contents\Graphics\LineDefinition.cs" />
     <Compile Include="PdfObjects\BasePdfObject.cs" />
     <Compile Include="PdfObjects\CatalogObject.cs" />
     <Compile Include="Containers\ByteArrayByteContainer.cs" />
@@ -77,9 +78,9 @@
     <Compile Include="PdfObjects\PageObject.cs" />
     <Compile Include="PdfObjects\PagesObject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Text\Command.cs" />
-    <Compile Include="Text\TextCommand.cs" />
-    <Compile Include="Text\WordWrapping.cs" />
+    <Compile Include="Contents\Text\Command.cs" />
+    <Compile Include="Contents\Text\TextCommand.cs" />
+    <Compile Include="Contents\Text\WordWrapping.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

PdfCraft/PdfObjects/ContentsObject.cs

@@ -4,6 +4,7 @@
 using PdfCraft.API;
 using PdfCraft.Constants;
 using PdfCraft.Containers;
+using PdfCraft.Contents;
 
 namespace PdfCraft
 {

Tests/Concerning_Fonts/Given_a_FontObject/When_it_is_created_with_valid_info.cs

@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using PdfCraft;
 using PdfCraft.Fonts;
 
 namespace Tests.Concerning_Fonts.Given_a_FontObject

Tests/Concerning_Fonts/Given_a_FontObject/When_it_is_created_with_valid_info_1.cs

@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using PdfCraft;
 using PdfCraft.Fonts;
 
 namespace Tests.Concerning_Fonts.Given_a_FontObject