Use ReadOnlyMemory<byte> in ShowText operators and implement MoveToNextLineShowTextWithSpacing parsing

BobLd · BobLd · commit bf664c3f0bf3 · 2025-06-29T14:27:14.000+01:00
diff --git a/src/UglyToad.PdfPig.Tokens/HexToken.cs b/src/UglyToad.PdfPig.Tokens/HexToken.cs
@@ -171,7 +171,7 @@ public string GetHexString()
 #if NET8_0_OR_GREATER
             return Convert.ToHexString(Bytes);
 #else
-            return BitConverter.ToString(Bytes.ToArray()).Replace("-", string.Empty);
+            return BitConverter.ToString(_bytes).Replace("-", string.Empty);
 #endif
         }
     }
diff --git a/src/UglyToad.PdfPig/Graphics/Operations/TextShowing/MoveToNextLineShowText.cs b/src/UglyToad.PdfPig/Graphics/Operations/TextShowing/MoveToNextLineShowText.cs
@@ -25,7 +25,7 @@ public class MoveToNextLineShowText : IGraphicsStateOperation
         /// <summary>
         /// The text to show as hex bytes.
         /// </summary>
-        public byte[]? Bytes { get; }
+        public ReadOnlyMemory<byte> Bytes { get; }
 
         /// <summary>
         /// Create a new <see cref="MoveToNextLineShowText"/>.
@@ -40,7 +40,7 @@ public MoveToNextLineShowText(string text)
         /// Create a new <see cref="MoveToNextLineShowText"/>.
         /// </summary>
         /// <param name="hexBytes">The bytes of the text to show.</param>
-        public MoveToNextLineShowText(byte[] hexBytes)
+        public MoveToNextLineShowText(ReadOnlyMemory<byte> hexBytes)
         {
             Bytes = hexBytes;
         }
@@ -50,7 +50,7 @@ public void Run(IOperationContext operationContext)
         {
             var move = MoveToNextLine.Value;
 
-            var showText = Text != null ? new ShowText(Text) : new ShowText(Bytes!);
+            var showText = Text != null ? new ShowText(Text) : new ShowText(Bytes);
 
             move.Run(operationContext);
             showText.Run(operationContext);
@@ -59,14 +59,14 @@ public void Run(IOperationContext operationContext)
         /// <inheritdoc />
         public void Write(Stream stream)
         {
-            if (Bytes is null)
+            if (Bytes.IsEmpty)
             {
                 stream.WriteText($"({Text}) {Symbol}");
                 stream.WriteNewLine();
             }
             else
             {
-                stream.WriteHex(Bytes);
+                stream.WriteHex(Bytes.Span);
                 stream.WriteWhiteSpace();
                 stream.WriteText(Symbol);
                 stream.WriteNewLine();
diff --git a/src/UglyToad.PdfPig/Graphics/Operations/TextShowing/MoveToNextLineShowTextWithSpacing.cs b/src/UglyToad.PdfPig/Graphics/Operations/TextShowing/MoveToNextLineShowTextWithSpacing.cs
@@ -31,7 +31,7 @@ public class MoveToNextLineShowTextWithSpacing : IGraphicsStateOperation
         /// <summary>
         /// The bytes of the text.
         /// </summary>
-        public byte[]? Bytes { get; }
+        public ReadOnlyMemory<byte> Bytes { get; }
 
         /// <summary>
         /// The text to show.
@@ -57,7 +57,7 @@ public MoveToNextLineShowTextWithSpacing(double wordSpacing, double characterSpa
         /// <param name="wordSpacing">The word spacing.</param>
         /// <param name="characterSpacing">The character spacing.</param>
         /// <param name="hexBytes">The bytes of the text to show.</param>
-        public MoveToNextLineShowTextWithSpacing(double wordSpacing, double characterSpacing, byte[] hexBytes)
+        public MoveToNextLineShowTextWithSpacing(double wordSpacing, double characterSpacing, ReadOnlyMemory<byte> hexBytes)
         {
             WordSpacing = wordSpacing;
             CharacterSpacing = characterSpacing;
@@ -86,9 +86,9 @@ public void Write(Stream stream)
             stream.WriteDouble(CharacterSpacing);
             stream.WriteWhiteSpace();
 
-            if (Bytes != null)
+            if (!Bytes.IsEmpty)
             {
-                stream.WriteHex(Bytes);
+                stream.WriteHex(Bytes.Span);
             }
             else
             {
diff --git a/src/UglyToad.PdfPig/Graphics/Operations/TextShowing/ShowText.cs b/src/UglyToad.PdfPig/Graphics/Operations/TextShowing/ShowText.cs
@@ -1,6 +1,7 @@
 ﻿namespace UglyToad.PdfPig.Graphics.Operations.TextShowing
 {
     using PdfPig.Core;
+    using System;
     using System.IO;
 
     /// <inheritdoc />
@@ -38,7 +39,7 @@ public class ShowText : IGraphicsStateOperation
         /// <summary>
         /// The bytes of the string to show.
         /// </summary>
-        public byte[]? Bytes { get; }
+        public ReadOnlyMemory<byte> Bytes { get; }
 
         /// <summary>
         /// Create a new <see cref="ShowText"/>.
@@ -51,7 +52,7 @@ public ShowText(string text)
         /// <summary>
         /// Create a new <see cref="ShowText"/>.
         /// </summary>
-        public ShowText(byte[] hexBytes)
+        public ShowText(ReadOnlyMemory<byte> hexBytes)
         {
             Bytes = hexBytes;
         }
@@ -60,7 +61,6 @@ public ShowText(byte[] hexBytes)
         public void Run(IOperationContext operationContext)
         {
             var input = new MemoryInputBytes(Text != null ? OtherEncodings.StringAsLatin1Bytes(Text) : Bytes);
-
             operationContext.ShowText(input);
         }
 
@@ -89,10 +89,9 @@ public void Run(IOperationContext operationContext)
         /// <inheritdoc />
         public void Write(Stream stream)
         {
-             
-            if (Bytes != null)
+            if (!Bytes.IsEmpty)
             {
-                stream.WriteHex(Bytes);
+                stream.WriteHex(Bytes.Span);
             }
             else
             {
diff --git a/src/UglyToad.PdfPig/Graphics/ReflectionGraphicsStateOperationFactory.cs b/src/UglyToad.PdfPig/Graphics/ReflectionGraphicsStateOperationFactory.cs
@@ -343,14 +343,29 @@ private static double OperandToDouble(IToken token)
                     {
                         return new MoveToNextLineShowText(snl.Data);
                     }
-                    else if (operands[0] is HexToken hnl)
+
+                    if (operands[0] is HexToken hnl)
                     {
-                        return new MoveToNextLineShowText(hnl.Bytes.ToArray());
+                        return new MoveToNextLineShowText(hnl.Memory);
                     }
-                    else
+
+                    throw new InvalidOperationException($"Tried to create a move to next line and show text operation with operand type: {operands[0]?.GetType().Name ?? "null"}");
+                case MoveToNextLineShowTextWithSpacing.Symbol:
+                    var wordSpacing = (NumericToken)operands[0];
+                    var charSpacing = (NumericToken)operands[1];
+                    var text = operands[2];
+
+                    if (text is StringToken stringToken)
+                    {
+                        return new MoveToNextLineShowTextWithSpacing(wordSpacing.Double, charSpacing.Double, stringToken.Data);
+                    }
+
+                    if (text is HexToken hexToken)
                     {
-                        throw new InvalidOperationException($"Tried to create a move to next line and show text operation with operand type: {operands[0]?.GetType().Name ?? "null"}");
+                        return new MoveToNextLineShowTextWithSpacing(wordSpacing.Double, charSpacing.Double, hexToken.Memory);
                     }
+
+                    throw new InvalidOperationException($"Tried to create a MoveToNextLineShowTextWithSpacing operation with operand type: {operands[2]?.GetType().Name ?? "null"}");
                 case MoveToNextLineWithOffset.Symbol:
                     return new MoveToNextLineWithOffset(OperandToDouble(operands[0]), OperandToDouble(operands[1]));
                 case MoveToNextLineWithOffsetSetLeading.Symbol:
@@ -364,7 +379,8 @@ private static double OperandToDouble(IToken token)
                     {
                         return new SetNonStrokeColorAdvanced(operands.Take(operands.Count - 1).Select(x => ((NumericToken)x).Data).ToArray(), scnLowerPatternName);
                     }
-                    else if (operands.All(x => x is NumericToken))
+                    
+                    if (operands.All(x => x is NumericToken))
                     {
                         return new SetNonStrokeColorAdvanced(operands.Select(x => ((NumericToken)x).Data).ToArray());
                     }
@@ -425,14 +441,13 @@ private static double OperandToDouble(IToken token)
                     {
                         return new ShowText(s.Data);
                     }
-                    else if (operands[0] is HexToken h)
-                    {
-                        return new ShowText(h.Bytes.ToArray());
-                    }
-                    else
+                    
+                    if (operands[0] is HexToken h)
                     {
-                        throw new InvalidOperationException($"Tried to create a show text operation with operand type: {operands[0]?.GetType().Name ?? "null"}");
+                        return new ShowText(h.Memory);
                     }
+                    
+                    throw new InvalidOperationException($"Tried to create a show text operation with operand type: {operands[0]?.GetType().Name ?? "null"}");
                 case ShowTextsWithPositioning.Symbol:
                     if (operands.Count == 0)
                     {

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ public string GetHexString()`
`171`	`171`	`#if NET8_0_OR_GREATER`
`172`	`172`	`return Convert.ToHexString(Bytes);`
`173`	`173`	`#else`
`174`		`- return BitConverter.ToString(Bytes.ToArray()).Replace("-", string.Empty);`
	`174`	`+ return BitConverter.ToString(_bytes).Replace("-", string.Empty);`
`175`	`175`	`#endif`
`176`	`176`	`}`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class MoveToNextLineShowText : IGraphicsStateOperation`
`25`	`25`	`/// <summary>`
`26`	`26`	`/// The text to show as hex bytes.`
`27`	`27`	`/// </summary>`
`28`		`- public byte[]? Bytes { get; }`
	`28`	`+ public ReadOnlyMemory<byte> Bytes { get; }`
`29`	`29`
`30`	`30`	`/// <summary>`
`31`	`31`	`/// Create a new <see cref="MoveToNextLineShowText"/>.`
`@@ -40,7 +40,7 @@ public MoveToNextLineShowText(string text)`
`40`	`40`	`/// Create a new <see cref="MoveToNextLineShowText"/>.`
`41`	`41`	`/// </summary>`
`42`	`42`	`/// <param name="hexBytes">The bytes of the text to show.</param>`
`43`		`- public MoveToNextLineShowText(byte[] hexBytes)`
	`43`	`+ public MoveToNextLineShowText(ReadOnlyMemory<byte> hexBytes)`
`44`	`44`	`{`
`45`	`45`	`Bytes = hexBytes;`
`46`	`46`	`}`
`@@ -50,7 +50,7 @@ public void Run(IOperationContext operationContext)`
`50`	`50`	`{`
`51`	`51`	`var move = MoveToNextLine.Value;`
`52`	`52`
`53`		`- var showText = Text != null ? new ShowText(Text) : new ShowText(Bytes!);`
	`53`	`+ var showText = Text != null ? new ShowText(Text) : new ShowText(Bytes);`
`54`	`54`
`55`	`55`	`move.Run(operationContext);`
`56`	`56`	`showText.Run(operationContext);`
`@@ -59,14 +59,14 @@ public void Run(IOperationContext operationContext)`
`59`	`59`	`/// <inheritdoc />`
`60`	`60`	`public void Write(Stream stream)`
`61`	`61`	`{`
`62`		`- if (Bytes is null)`
	`62`	`+ if (Bytes.IsEmpty)`
`63`	`63`	`{`
`64`	`64`	`stream.WriteText($"({Text}) {Symbol}");`
`65`	`65`	`stream.WriteNewLine();`
`66`	`66`	`}`
`67`	`67`	`else`
`68`	`68`	`{`
`69`		`- stream.WriteHex(Bytes);`
	`69`	`+ stream.WriteHex(Bytes.Span);`
`70`	`70`	`stream.WriteWhiteSpace();`
`71`	`71`	`stream.WriteText(Symbol);`
`72`	`72`	`stream.WriteNewLine();`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`namespace UglyToad.PdfPig.Graphics.Operations.TextShowing`
`2`	`2`	`{`
`3`	`3`	`using PdfPig.Core;`
	`4`	`+ using System;`
`4`	`5`	`using System.IO;`
`5`	`6`
`6`	`7`	`/// <inheritdoc />`
`@@ -38,7 +39,7 @@ public class ShowText : IGraphicsStateOperation`
`38`	`39`	`/// <summary>`
`39`	`40`	`/// The bytes of the string to show.`
`40`	`41`	`/// </summary>`
`41`		`- public byte[]? Bytes { get; }`
	`42`	`+ public ReadOnlyMemory<byte> Bytes { get; }`
`42`	`43`
`43`	`44`	`/// <summary>`
`44`	`45`	`/// Create a new <see cref="ShowText"/>.`
`@@ -51,7 +52,7 @@ public ShowText(string text)`
`51`	`52`	`/// <summary>`
`52`	`53`	`/// Create a new <see cref="ShowText"/>.`
`53`	`54`	`/// </summary>`
`54`		`- public ShowText(byte[] hexBytes)`
	`55`	`+ public ShowText(ReadOnlyMemory<byte> hexBytes)`
`55`	`56`	`{`
`56`	`57`	`Bytes = hexBytes;`
`57`	`58`	`}`
`@@ -60,7 +61,6 @@ public ShowText(byte[] hexBytes)`
`60`	`61`	`public void Run(IOperationContext operationContext)`
`61`	`62`	`{`
`62`	`63`	`var input = new MemoryInputBytes(Text != null ? OtherEncodings.StringAsLatin1Bytes(Text) : Bytes);`
`63`		`-`
`64`	`64`	`operationContext.ShowText(input);`
`65`	`65`	`}`
`66`	`66`
`@@ -89,10 +89,9 @@ public void Run(IOperationContext operationContext)`
`89`	`89`	`/// <inheritdoc />`
`90`	`90`	`public void Write(Stream stream)`
`91`	`91`	`{`
`92`		`-`
`93`		`- if (Bytes != null)`
	`92`	`+ if (!Bytes.IsEmpty)`
`94`	`93`	`{`
`95`		`- stream.WriteHex(Bytes);`
	`94`	`+ stream.WriteHex(Bytes.Span);`
`96`	`95`	`}`
`97`	`96`	`else`
`98`	`97`	`{`
Original file line number	Diff line number	Diff line change
`@@ -343,14 +343,29 @@ private static double OperandToDouble(IToken token)`
`343`	`343`	`{`
`344`	`344`	`return new MoveToNextLineShowText(snl.Data);`
`345`	`345`	`}`
`346`		`- else if (operands[0] is HexToken hnl)`
	`346`	`+`
	`347`	`+ if (operands[0] is HexToken hnl)`
`347`	`348`	`{`
`348`		`- return new MoveToNextLineShowText(hnl.Bytes.ToArray());`
	`349`	`+ return new MoveToNextLineShowText(hnl.Memory);`
`349`	`350`	`}`
`350`		`- else`
	`351`	`+`
	`352`	`+ throw new InvalidOperationException($"Tried to create a move to next line and show text operation with operand type: {operands[0]?.GetType().Name ?? "null"}");`
	`353`	`+ case MoveToNextLineShowTextWithSpacing.Symbol:`
	`354`	`+ var wordSpacing = (NumericToken)operands[0];`
	`355`	`+ var charSpacing = (NumericToken)operands[1];`
	`356`	`+ var text = operands[2];`
	`357`	`+`
	`358`	`+ if (text is StringToken stringToken)`
	`359`	`+ {`
	`360`	`+ return new MoveToNextLineShowTextWithSpacing(wordSpacing.Double, charSpacing.Double, stringToken.Data);`
	`361`	`+ }`
	`362`	`+`
	`363`	`+ if (text is HexToken hexToken)`
`351`	`364`	`{`
`352`		`- throw new InvalidOperationException($"Tried to create a move to next line and show text operation with operand type: {operands[0]?.GetType().Name ?? "null"}");`
	`365`	`+ return new MoveToNextLineShowTextWithSpacing(wordSpacing.Double, charSpacing.Double, hexToken.Memory);`
`353`	`366`	`}`
	`367`	`+`
	`368`	`+ throw new InvalidOperationException($"Tried to create a MoveToNextLineShowTextWithSpacing operation with operand type: {operands[2]?.GetType().Name ?? "null"}");`
`354`	`369`	`case MoveToNextLineWithOffset.Symbol:`
`355`	`370`	`return new MoveToNextLineWithOffset(OperandToDouble(operands[0]), OperandToDouble(operands[1]));`
`356`	`371`	`case MoveToNextLineWithOffsetSetLeading.Symbol:`
`@@ -364,7 +379,8 @@ private static double OperandToDouble(IToken token)`
`364`	`379`	`{`
`365`	`380`	`return new SetNonStrokeColorAdvanced(operands.Take(operands.Count - 1).Select(x => ((NumericToken)x).Data).ToArray(), scnLowerPatternName);`
`366`	`381`	`}`
`367`		`- else if (operands.All(x => x is NumericToken))`
	`382`	`+`
	`383`	`+ if (operands.All(x => x is NumericToken))`
`368`	`384`	`{`
`369`	`385`	`return new SetNonStrokeColorAdvanced(operands.Select(x => ((NumericToken)x).Data).ToArray());`
`370`	`386`	`}`
`@@ -425,14 +441,13 @@ private static double OperandToDouble(IToken token)`
`425`	`441`	`{`
`426`	`442`	`return new ShowText(s.Data);`
`427`	`443`	`}`
`428`		`- else if (operands[0] is HexToken h)`
`429`		`- {`
`430`		`- return new ShowText(h.Bytes.ToArray());`
`431`		`- }`
`432`		`- else`
	`444`	`+`
	`445`	`+ if (operands[0] is HexToken h)`
`433`	`446`	`{`
`434`		`- throw new InvalidOperationException($"Tried to create a show text operation with operand type: {operands[0]?.GetType().Name ?? "null"}");`
	`447`	`+ return new ShowText(h.Memory);`
`435`	`448`	`}`
	`449`	`+`
	`450`	`+ throw new InvalidOperationException($"Tried to create a show text operation with operand type: {operands[0]?.GetType().Name ?? "null"}");`
`436`	`451`	`case ShowTextsWithPositioning.Symbol:`
`437`	`452`	`if (operands.Count == 0)`
`438`	`453`	`{`