Fixing ^PQ command

sungaila · Jul 11, 2024 · 7e9a0a6 · 7e9a0a6
1 parent f98b742
commit 7e9a0a6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -12,7 +12,7 @@ body:
     attributes:
       label: PDFtoZPL version
       description: Which version of PDFtoZPL is affected?
-      value: 5.0.3
+      value: 5.1.0
     validations:
       required: true
   - type: dropdown

diff --git a/Console/Console.csproj b/Console/Console.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>PDFtoZPL.Console</AssemblyName>
     <RootNamespace>PDFtoZPL.Console</RootNamespace>
     <StartupObject>PDFtoZPL.Console.Program</StartupObject>
-    <Version>5.0.3</Version>
+    <Version>5.1.0</Version>
     <Configurations>Debug;Release;ReleaseSigned</Configurations>
   </PropertyGroup>
 

diff --git a/PDFtoZPL/Conversion.cs b/PDFtoZPL/Conversion.cs
@@ -403,9 +403,8 @@ private static string ConvertBitmapImpl(SKBitmap pdfBitmap, ZplOptions zplOption
                     zpl = zpl.Replace("^XA", $"^XA^LL{inputBitmap.Height}");
 
                 // set the ^PQ to control the number of labels to print
-                // no print pausing and one replicate per serial number
                 if (zplOptions.PrintQuantity > 0)
-                    zpl = $"^PQ{Math.Min(zplOptions.PrintQuantity, 99999999)},0,1,Y" + zpl;
+                    zpl = zpl.Replace("^XZ", $"^PQ{Math.Min(zplOptions.PrintQuantity, 99999999)}^XZ");
 
                 // finally return the complete ZPL code
                 return zpl;

diff --git a/PDFtoZPL/PDFtoZPL.csproj b/PDFtoZPL/PDFtoZPL.csproj
@@ -12,7 +12,7 @@
 
   <!-- NuGet -->
   <PropertyGroup>
-    <VersionPrefix>5.0.3</VersionPrefix>
+    <VersionPrefix>5.1.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <Authors>David Sungaila</Authors>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/Tests/PrintQuantityTests.ExpectedResults.cs b/Tests/PrintQuantityTests.ExpectedResults.cs
diff --git a/WebConverter/WebConverter.csproj b/WebConverter/WebConverter.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>PDFtoZPL.WebConverter</AssemblyName>
     <RootNamespace>PDFtoZPL.WebConverter</RootNamespace>
     <StartupObject>PDFtoZPL.WebConverter.Program</StartupObject>
-    <VersionPrefix>5.0.3</VersionPrefix>
+    <VersionPrefix>5.1.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <RunAOTCompilation>true</RunAOTCompilation>
     <WasmNativeStrip>true</WasmNativeStrip>
@@ -46,8 +46,8 @@
   <ItemGroup>
     <PackageReference Include="ByteSize" Version="2.1.2" />
     <PackageReference Include="Markdig.Signed" Version="0.37.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.7" PrivateAssets="all" />
     <PackageReference Include="Thinktecture.Blazor.FileHandling" Version="2.0.0" />
     <PackageReference Include="Thinktecture.Blazor.WebShare" Version="2.0.0" />
   </ItemGroup>