synercoder · synercoder · Sep 19, 2023 · Jun 15, 2023 · Jun 15, 2023 · Sep 19, 2023
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -45,12 +45,7 @@
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Features>strict</Features>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net5.0'))">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MEMBERNOTNULL</DefineConstants>
-    <DefineConstants>$(DefineConstants);SUPPORTS_INIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);SUPPORTS_TYPED_ENUM_ISDEFINED</DefineConstants>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -7,8 +7,22 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Update="SixLabors.ImageSharp" Version="2.1.*" />
-    <PackageReference Update="Synercoding.Primitives" Version="1.0.0-rc09" />
+    <PackageReference Update="SixLabors.ImageSharp" Version="3.0.*" />
+  </ItemGroup>
+
+  <!-- Disable auto imports/usings from ImageSharp -->
+  <ItemGroup>
+    <Using Remove="SixLabors.ImageSharp" />
+    <Using Remove="SixLabors.ImageSharp.PixelFormats" />
+    <Using Remove="SixLabors.ImageSharp.Processing" />
+  </ItemGroup>
+
+  <!-- For ease of use -->
+  <ItemGroup>
+    <PackageReference Include="Synercoding.Primitives" Version="1.0.0-rc09" />
+    <Using Static="true" Include="Synercoding.Primitives.ValueCreator" />
+    <Using Include="Synercoding.Primitives" />
+    <Using Include="Synercoding.Primitives.Extensions" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Synercoding.FileFormats.Pdf.ConsoleTester/Program.cs b/samples/Synercoding.FileFormats.Pdf.ConsoleTester/Program.cs
@@ -2,11 +2,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors;
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
-using Synercoding.Primitives;
-using Synercoding.Primitives.Extensions;
-using System;
-using System.IO;
-using static Synercoding.Primitives.ValueCreator;
 
 namespace Synercoding.FileFormats.Pdf.ConsoleTester;
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.props</MSBuildAllProjects>
     <SynercodingProjectCategory>src</SynercodingProjectCategory>
   </PropertyGroup>

diff --git a/src/Synercoding.FileFormats.Pdf/DocumentInformation.cs b/src/Synercoding.FileFormats.Pdf/DocumentInformation.cs
@@ -1,6 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel;
-using System;
-using System.Collections.Generic;
 
 namespace Synercoding.FileFormats.Pdf;
 

diff --git a/src/Synercoding.FileFormats.Pdf/Extensions/IContentContextExtensions.cs b/src/Synercoding.FileFormats.Pdf/Extensions/IContentContextExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Threading.Tasks;
-
 namespace Synercoding.FileFormats.Pdf.Extensions;
 
 /// <summary>

diff --git a/src/Synercoding.FileFormats.Pdf/Extensions/IPageContentContextExtensions.cs b/src/Synercoding.FileFormats.Pdf/Extensions/IPageContentContextExtensions.cs
@@ -1,11 +1,6 @@
 using Synercoding.FileFormats.Pdf.Internals;
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
-using Synercoding.Primitives;
-using Synercoding.Primitives.Extensions;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Synercoding.FileFormats.Pdf.Extensions;
 

diff --git a/src/Synercoding.FileFormats.Pdf/Extensions/IShapeContextExtensions.cs b/src/Synercoding.FileFormats.Pdf/Extensions/IShapeContextExtensions.cs
@@ -1,6 +1,3 @@
-using Synercoding.Primitives;
-using Synercoding.Primitives.Extensions;
-
 namespace Synercoding.FileFormats.Pdf.Extensions;
 
 /// <summary>

diff --git a/src/Synercoding.FileFormats.Pdf/Extensions/PrimitiveExtensions.cs b/src/Synercoding.FileFormats.Pdf/Extensions/PrimitiveExtensions.cs
@@ -1,5 +1,3 @@
-using Synercoding.Primitives;
-
 namespace Synercoding.FileFormats.Pdf.Extensions;
 
 /// <summary>

diff --git a/src/Synercoding.FileFormats.Pdf/GraphicState.cs b/src/Synercoding.FileFormats.Pdf/GraphicState.cs
@@ -1,7 +1,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
-using System.Linq;
 
 namespace Synercoding.FileFormats.Pdf;
 

diff --git a/src/Synercoding.FileFormats.Pdf/IContentContext.cs b/src/Synercoding.FileFormats.Pdf/IContentContext.cs
@@ -1,8 +1,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel;
 using Synercoding.FileFormats.Pdf.LowLevel.Colors;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
-using System;
-using System.Threading.Tasks;
 
 namespace Synercoding.FileFormats.Pdf;
 

diff --git a/src/Synercoding.FileFormats.Pdf/IPageContentContext.cs b/src/Synercoding.FileFormats.Pdf/IPageContentContext.cs
@@ -1,6 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel;
-using System;
-using System.Threading.Tasks;
 
 namespace Synercoding.FileFormats.Pdf;
 

diff --git a/src/Synercoding.FileFormats.Pdf/Image.cs b/src/Synercoding.FileFormats.Pdf/Image.cs
@@ -1,8 +1,6 @@
 using SixLabors.ImageSharp;
 using Synercoding.FileFormats.Pdf.LowLevel;
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
-using System;
-using System.IO;
 
 namespace Synercoding.FileFormats.Pdf;
 
@@ -21,7 +19,7 @@ internal Image(PdfReference id, SixLabors.ImageSharp.Image image)
         image.SaveAsJpeg(ms, new SixLabors.ImageSharp.Formats.Jpeg.JpegEncoder()
         {
             Quality = 100,
-            ColorType = SixLabors.ImageSharp.Formats.Jpeg.JpegColorType.YCbCrRatio444
+            ColorType = SixLabors.ImageSharp.Formats.Jpeg.JpegEncodingColor.YCbCrRatio444
         });
         Width = image.Width;
         Height = image.Height;

diff --git a/src/Synercoding.FileFormats.Pdf/Internals/ByteSizes.cs b/src/Synercoding.FileFormats.Pdf/Internals/ByteSizes.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Globalization;
 
 namespace Synercoding.FileFormats.Pdf.Internals;

diff --git a/src/Synercoding.FileFormats.Pdf/Internals/Map.cs b/src/Synercoding.FileFormats.Pdf/Internals/Map.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections;
-using System.Collections.Generic;
 
 namespace Synercoding.FileFormats.Pdf.Internals;
 

diff --git a/src/Synercoding.FileFormats.Pdf/Internals/PageContentContext.cs b/src/Synercoding.FileFormats.Pdf/Internals/PageContentContext.cs
@@ -1,8 +1,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel;
 using Synercoding.FileFormats.Pdf.LowLevel.Colors;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
-using System;
-using System.Threading.Tasks;
 
 namespace Synercoding.FileFormats.Pdf.Internals;
 

diff --git a/src/Synercoding.FileFormats.Pdf/Internals/ShapesContentContext.cs b/src/Synercoding.FileFormats.Pdf/Internals/ShapesContentContext.cs
@@ -1,8 +1,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel;
 using Synercoding.FileFormats.Pdf.LowLevel.Colors;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
-using System;
-using System.Threading.Tasks;
 
 namespace Synercoding.FileFormats.Pdf.Internals;
 

diff --git a/src/Synercoding.FileFormats.Pdf/Internals/SpanHelper.cs b/src/Synercoding.FileFormats.Pdf/Internals/SpanHelper.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.Internals;
 
 internal static class SpanHelper

diff --git a/src/Synercoding.FileFormats.Pdf/Internals/StringHelper.cs b/src/Synercoding.FileFormats.Pdf/Internals/StringHelper.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Text;
 
 namespace Synercoding.FileFormats.Pdf.Internals;

diff --git a/src/Synercoding.FileFormats.Pdf/Internals/TextContentContext.cs b/src/Synercoding.FileFormats.Pdf/Internals/TextContentContext.cs
@@ -2,8 +2,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
-using System;
-using System.Threading.Tasks;
 
 namespace Synercoding.FileFormats.Pdf.Internals;
 

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/CmykColor.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/CmykColor.cs
@@ -1,5 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors;
 

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/Color.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/Color.cs
@@ -1,5 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors;
 

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/ColorSpace.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/ColorSpace.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 
 /// <summary>

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/DeviceCMYK.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/DeviceCMYK.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 
 /// <summary>

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/DeviceGray.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/DeviceGray.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 
 /// <summary>

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/DeviceRGB.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/DeviceRGB.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 
 /// <summary>

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/Separation.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/Separation.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 
 /// <summary>

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/GrayColor.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/GrayColor.cs
@@ -1,5 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors;
 

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/RgbColor.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/RgbColor.cs
@@ -1,5 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors;
 

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/SpotColor.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Colors/SpotColor.cs
@@ -1,5 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors;
 

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/ContentStream.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/ContentStream.cs
@@ -4,11 +4,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
 using Synercoding.FileFormats.Pdf.LowLevel.Internal;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
-using Synercoding.Primitives;
-using Synercoding.Primitives.Extensions;
-using System;
-using System.IO;
-using System.Linq;
 using Color = Synercoding.FileFormats.Pdf.LowLevel.Colors.Color;
 using Point = Synercoding.Primitives.Point;
 

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Extensions/PdfStreamExtensions.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Extensions/PdfStreamExtensions.cs
@@ -1,7 +1,3 @@
-using Synercoding.Primitives;
-using System;
-using System.IO;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Extensions;
 
 /// <summary>
@@ -259,8 +255,16 @@ public static PdfStream WriteStringLiteral(this PdfStream stream, string value)
                 stream.Write('\\').Write(')');
             else if (c == '\\')
                 stream.Write('\\').Write('\\');
-            else if (c > 0x7F && c < 0x200)
-                stream.Write('\\').Write(_toOctal(c));
+            else if (c > 0x7F && c <= 0xFF)
+            {
+                var octal = _toOctal(c);
+                _ = octal switch
+                {
+                    < 10 => stream.Write('\\').Write('0').Write('0').Write(octal),
+                    < 100 => stream.Write('\\').Write('0').Write(octal),
+                    _ => stream.Write('\\').Write(octal)
+                };
+            }
             else if (c <= 0x7F)
                 stream.Write(c);
             else

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Extensions/StreamFilterExtensions.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Extensions/StreamFilterExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Extensions;
 
 internal static class StreamFilterExtensions

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Graphics/Dash.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Graphics/Dash.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Graphics;
 
 /// <summary>

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Internal/PageResources.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Internal/PageResources.cs
@@ -2,9 +2,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
 using Synercoding.FileFormats.Pdf.LowLevel.XRef;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.Internal;
 

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Internal/PageTree.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Internal/PageTree.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Internal;
 
 internal class PageTree

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/ObjectStream.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/ObjectStream.cs
@@ -3,9 +3,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Internal;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
 using Synercoding.FileFormats.Pdf.LowLevel.XRef;
-using System;
-using System.IO;
-using System.Linq;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel;
 
@@ -124,6 +121,7 @@ public ObjectStream Write(PdfPage page)
                 .WriteIfNotNull(PdfName.Get("CropBox"), page.CropBox)
                 .WriteIfNotNull(PdfName.Get("BleedBox"), page.BleedBox)
                 .WriteIfNotNull(PdfName.Get("TrimBox"), page.TrimBox)
+                .WriteIfNotNull(PdfName.Get("ArtBox"), page.ArtBox)
                 .WriteIfNotNull(PdfName.Get("Rotate"), (int?)page.Rotation);
 
             // Resources

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/PdfDictionary.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/PdfDictionary.cs
@@ -1,6 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Extensions;
-using Synercoding.Primitives;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel;
 

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/PdfName.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/PdfName.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel;
@@ -96,25 +93,13 @@ private static string _encode(string input)
             // 0xff because only ascii is supported in pdf names
             var encoded = c switch
             {
-                // Pdf reserved characters
-                ' ' => "#20",
-                '#' => "#23",
-                '%' => "#25",
-                '(' => "#28",
-                ')' => "#29",
-                '/' => "#2f",
-                '<' => "#3c",
-                '>' => "#3e",
-                '[' => "#5b",
-                ']' => "#5d",
-                '{' => "#7b",
-                '}' => "#7d",
+                (char)0 => throw new InvalidOperationException("NULL character is not allowed in a pdf name."),
+                var cc when cc >= 'a' && cc <= 'z' => cc.ToString(),
+                var cc when cc >= 'A' && cc <= 'Z' => cc.ToString(),
+                var cc when cc >= '0' && cc <= '9' => cc.ToString(),
                 // special characters
                 var cc when cc < 16 => $"#0{Convert.ToString(cc, 16)}",
-                var cc when cc < 32 => '#' + Convert.ToString(cc, 16),
-                var cc when cc > 126 => '#' + Convert.ToString(cc, 16),
-                // "readable characters"
-                var cc => cc.ToString()
+                var cc => '#' + Convert.ToString(cc, 16),
             };
             pdfName.Append(encoded);
         }

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/PdfStream.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/PdfStream.cs
@@ -1,7 +1,5 @@
 using Synercoding.FileFormats.Pdf.Internals;
-using System;
 using System.Globalization;
-using System.IO;
 using System.Text;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel;

diff --git a/src/Synercoding.FileFormats.Pdf/LowLevel/Text/Font.cs b/src/Synercoding.FileFormats.Pdf/LowLevel/Text/Font.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Text;
 
 /// <summary>