Merge pull request #49 from synercoder/features/initial-text-support

Initial text support

.github/workflows/dotnet-core.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
       - name: Restore
         run: dotnet restore
       - name: Build
@@ -73,7 +73,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
       - name: Create Release NuGet package
         run: |
           arrTag=(${GITHUB_REF//\// })

Directory.Build.props

@@ -41,7 +41,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Features>strict</Features>

Directory.Build.targets

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Update="SixLabors.ImageSharp" Version="1.0.4" />
+    <PackageReference Update="SixLabors.ImageSharp" Version="2.1.*" />
     <PackageReference Update="Synercoding.Primitives" Version="1.0.0-rc08" />
   </ItemGroup>
 

samples/Synercoding.FileFormats.Pdf.ConsoleTester/Program.cs

@@ -1,10 +1,12 @@
 using Synercoding.FileFormats.Pdf.Extensions;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics.Colors;
+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
 {
@@ -30,6 +32,7 @@ public static void Main(string[] args)
                     {
                         info.Author = "Gerard Gunnewijk";
                         info.Title = "Example 1";
+                        info.Creator = "Synercoding.FileFormats.Pdf";
                         info.ExtraInfo.Add("CutContourProgramId", "cloud-shape");
                     })
                     // Add image to writer directly and then use that image in the page
@@ -73,6 +76,9 @@ public static void Main(string[] args)
                     // Test shape graphics
                     .AddPage(page =>
                     {
+                        page.MediaBox = mediaBox;
+                        page.TrimBox = trimBox;
+
                         page.AddShapes(ctx =>
                         {
                             ctx.DefaultState(g =>
@@ -109,6 +115,31 @@ public static void Main(string[] args)
                                 .Close();
                         });
                     })
+                    // Test pages with text
+                    .AddPage(page =>
+                    {
+                        page.MediaBox = mediaBox;
+                        page.TrimBox = trimBox;
+
+                        page.AddText("The quick brown fox jumps over the lazy dog.", new Point(Mm(10), Mm(10)), new TextState(StandardFonts.Helvetica, 12)
+                        {
+                            Fill = PredefinedColors.Blue
+                        });
+                        page.AddText("Text with a newline" + Environment.NewLine + "in it.", new Point(Mm(10), Mm(20)));
+                    })
+                    .AddPage(page =>
+                    {
+                        page.MediaBox = mediaBox;
+                        page.TrimBox = trimBox;
+
+                        page.AddText("This page also used Helvetica", new Point(Mm(10), Mm(10)), state =>
+                        {
+                            state.FontSize = 32;
+                            state.Font = StandardFonts.Helvetica;
+                            state.RenderingMode = TextRenderingMode.Stroke;
+                            state.Stroke = PredefinedColors.Red;
+                        });
+                    })
                     // Test placement using matrix
                     .AddPage(page =>
                     {

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;netstandard2.1</TargetFrameworks>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.props</MSBuildAllProjects>
     <SynercodingProjectCategory>src</SynercodingProjectCategory>
   </PropertyGroup>
@@ -13,7 +13,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='DEBUG'">
     <WarningsNotAsErrors>CS1591</WarningsNotAsErrors>
   </PropertyGroup>
 

src/Synercoding.FileFormats.Pdf/Extensions/PdfPageExtensions.cs

@@ -1,4 +1,9 @@
 using Synercoding.FileFormats.Pdf.Internals;
+using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
+using Synercoding.FileFormats.Pdf.LowLevel.Graphics.Colors;
+using Synercoding.FileFormats.Pdf.LowLevel.Operators.Color;
+using Synercoding.FileFormats.Pdf.LowLevel.Operators.State;
+using Synercoding.FileFormats.Pdf.LowLevel.Text;
 using Synercoding.Primitives;
 using System;
 using System.IO;
@@ -10,6 +15,84 @@ namespace Synercoding.FileFormats.Pdf.Extensions
     /// </summary>
     public static class PdfPageExtensions
     {
+        /// <summary>
+        /// Add text to the page.
+        /// </summary>
+        /// <param name="page">The page to add the text to.</param>
+        /// <param name="text">The text to add.</param>
+        /// <param name="point">The location of the text.</param>
+        /// <returns>The same <see cref="PdfPage"/> to chain other calls.</returns>
+        public static PdfPage AddText(this PdfPage page, string text, Point point)
+            => page.AddText(text, point, new TextState());
+
+        /// <summary>
+        /// Add text to the page.
+        /// </summary>
+        /// <param name="page">The page to add the text to.</param>
+        /// <param name="text">The text to add.</param>
+        /// <param name="point">The location of the text.</param>
+        /// <param name="configureState">Configure the state of the text to place.</param>
+        /// <returns>The same <see cref="PdfPage"/> to chain other calls.</returns>
+        public static PdfPage AddText(this PdfPage page, string text, Point point, Action<TextState> configureState)
+        {
+            var state = new TextState();
+            configureState(state);
+
+            return page.AddText(text, point, state);
+        }
+
+        /// <summary>
+        /// Add text to the page.
+        /// </summary>
+        /// <param name="page">The page to add the text to.</param>
+        /// <param name="text">The text to add.</param>
+        /// <param name="point">The location of the text.</param>
+        /// <param name="state">The state of the text to place.</param>
+        /// <returns>The same <see cref="PdfPage"/> to chain other calls.</returns>
+        public static PdfPage AddText(this PdfPage page, string text, Point point, TextState state)
+        {
+            page.MarkStdFontAsUsed(state.Font);
+
+            page.ContentStream
+                .SaveState()
+                .BeginText()
+                .SetTextPosition(point)
+                .SetFontAndSize(state.Font.LookupName, state.FontSize)
+                .SetTextLeading(state.Leading ?? state.FontSize);
+
+            if (state.Fill is Color fill)
+                page.ContentStream.SetColorFill(fill);
+            if (state.Stroke is Color stroke)
+                page.ContentStream.SetColorStroke(stroke);
+            if (state.LineWidth is double lineWidth)
+                page.ContentStream.Write(new LineWidthOperator(lineWidth));
+            if (state.LineCap is LineCapStyle lineCapStyle)
+                page.ContentStream.Write(new LineCapOperator(lineCapStyle));
+            if (state.LineJoin is LineJoinStyle lineJoinStyle)
+                page.ContentStream.Write(new LineJoinOperator(lineJoinStyle));
+            if (state.MiterLimit is double miterLimit)
+                page.ContentStream.Write(new MiterLimitOperator(miterLimit));
+            if (state.Dash is Dash dash)
+                page.ContentStream.Write(new DashOperator(dash.Array, dash.Phase));
+            if (state.CharacterSpacing is float charSpace)
+                page.ContentStream.SetCharacterSpacing(charSpace);
+            if (state.WordSpacing is float wordSpace)
+                page.ContentStream.SetWordSpacing(wordSpace);
+            if (state.HorizontalScaling is float horizontalScaling)
+                page.ContentStream.SetHorizontalScaling(horizontalScaling);
+            if (state.TextRise is float textRise)
+                page.ContentStream.SetTextRise(textRise);
+            if (state.RenderingMode is TextRenderingMode textRenderingMode)
+                page.ContentStream.SetTextRenderMode(textRenderingMode);
+
+            page.ContentStream
+                .ShowText(text)
+                .EndText()
+                .RestoreState();
+
+            return page;
+        }
+
         /// <summary>
         /// Add an image to the pdf page
         /// </summary>

src/Synercoding.FileFormats.Pdf/Image.cs

@@ -23,7 +23,7 @@ internal Image(PdfReference id, SixLabors.ImageSharp.Image image)
             image.SaveAsJpeg(ms, new SixLabors.ImageSharp.Formats.Jpeg.JpegEncoder()
             {
                 Quality = 100,
-                Subsample = SixLabors.ImageSharp.Formats.Jpeg.JpegSubsample.Ratio420
+                ColorType = SixLabors.ImageSharp.Formats.Jpeg.JpegColorType.YCbCrRatio444
             });
             Width = image.Width;
             Height = image.Height;