Skip to content

Compatibility options #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Compatibility options #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5c315b4
Add ref preserve
d-peczkowski Jun 18, 2025
7af5961
prevent implicit transparency group
d-peczkowski Jun 23, 2025
9465293
prevent implicit metadata
d-peczkowski Jun 23, 2025
a2e5d3f
prevent comment in trailer
d-peczkowski Jun 23, 2025
36f4b8b
configure line endings
d-peczkowski Jun 24, 2025
835ec20
replace binary tag
d-peczkowski Jun 25, 2025
2d72b49
put pdf pages at end
d-peczkowski Jun 25, 2025
629e2e0
put pdf catalog at end
d-peczkowski Jun 25, 2025
8dc9190
flatten array objects
d-peczkowski Jun 25, 2025
9c9fa54
add flags
d-peczkowski Jun 25, 2025
8d06611
optional owner password check
d-peczkowski Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@ InternalAgentState.json
*tempfile.*
launchsettings.json
testEnvironments.json
.cr/
101 changes: 61 additions & 40 deletions src/foundation/src/PDFsharp/src/PdfSharp/Drawing.Pdf/PdfGraphicsState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,15 @@ public PdfGraphicsState Clone()
public void PushState()
{
// BeginGraphic
renderer.Append("q/n");
renderer.Append("q");
renderer.Append(renderer.Owner.Options.LineEnding);
}

public void PopState()
{
//BeginGraphic
renderer.Append("Q/n");
renderer.Append("Q");
renderer.Append(renderer.Owner.Options.LineEnding);
}

#region Stroke
Expand All @@ -64,36 +66,40 @@ public void PopState()

public void RealizePen(XPen pen, PdfColorMode colorMode)
{
const string format = Config.SignificantDecimalPlaces3;
const string format2 = Config.SignificantDecimalPlaces2;
const string format3 = Config.SignificantDecimalPlaces3;

XColor color = pen.Color;
bool overPrint = pen.Overprint;
color = ColorSpaceHelper.EnsureColorMode(colorMode, color);

if (_realizedLineWith != pen.Width)
{
renderer.AppendFormatArgs("{0:" + format + "} w\n", pen.Width);
renderer.AppendFormatArgs("{0:" + format3 + "} w", pen.Width);
renderer.Append(renderer.Owner.Options.LineEnding);
_realizedLineWith = pen.Width;
}

if (_realizedLineCap != (int)pen.LineCap)
{
renderer.AppendFormatArgs("{0} J\n", (int)pen.LineCap);
renderer.AppendFormatArgs("{0} J", (int)pen.LineCap);
renderer.Append(renderer.Owner.Options.LineEnding);
_realizedLineCap = (int)pen.LineCap;
}

if (_realizedLineJoin != (int)pen.LineJoin)
{
renderer.AppendFormatArgs("{0} j\n", (int)pen.LineJoin);
renderer.AppendFormatArgs("{0} j", (int)pen.LineJoin);
renderer.Append(renderer.Owner.Options.LineEnding);
_realizedLineJoin = (int)pen.LineJoin;
}

if (_realizedLineCap == (int)XLineJoin.Miter)
{
if (_realizedMiterLimit != (int)pen.MiterLimit && (int)pen.MiterLimit != 0)
{
renderer.AppendFormatInt("{0} M\n", (int)pen.MiterLimit);
renderer.AppendFormatInt("{0} M", (int)pen.MiterLimit);
renderer.Append(renderer.Owner.Options.LineEnding);
_realizedMiterLimit = (int)pen.MiterLimit;
}
}
Expand All @@ -111,23 +117,28 @@ public void RealizePen(XPen pen, PdfColorMode colorMode)
switch (dashStyle)
{
case XDashStyle.Solid:
renderer.Append("[]0 d\n");
renderer.Append("[]0 d");
renderer.Append(renderer.Owner.Options.LineEnding);
break;

case XDashStyle.Dash:
renderer.AppendFormatArgs("[{0:" + format2 + "} {1:" + format2 + "}]0 d\n", dash, dot);
renderer.AppendFormatArgs("[{0:" + format2 + "} {1:" + format2 + "}]0 d", dash, dot);
renderer.Append(renderer.Owner.Options.LineEnding);
break;

case XDashStyle.Dot:
renderer.AppendFormatArgs("[{0:" + format2 + "}]0 d\n", dot);
renderer.AppendFormatArgs("[{0:" + format2 + "}]0 d", dot);
renderer.Append(renderer.Owner.Options.LineEnding);
break;

case XDashStyle.DashDot:
renderer.AppendFormatArgs("[{0:" + format2 + "} {1:" + format2 + "} {1:" + format2 + "} {1:" + format2 + "}]0 d\n", dash, dot);
renderer.AppendFormatArgs("[{0:" + format2 + "} {1:" + format2 + "} {1:" + format2 + "} {1:" + format2 + "}]0 d", dash, dot);
renderer.Append(renderer.Owner.Options.LineEnding);
break;

case XDashStyle.DashDotDot:
renderer.AppendFormatArgs("[{0:" + format2 + "} {1:" + format2 + "} {1:" + format2 + "} {1:" + format2 + "} {1:" + format2 + "} {1:" + format2 + "}]0 d\n", dash, dot);
renderer.AppendFormatArgs("[{0:" + format2 + "} {1:" + format2 + "} {1:" + format2 + "} {1:" + format2 + "} {1:" + format2 + "} {1:" + format2 + "}]0 d", dash, dot);
renderer.Append(renderer.Owner.Options.LineEnding);
break;

case XDashStyle.Custom:
Expand All @@ -146,7 +157,8 @@ public void RealizePen(XPen pen, PdfColorMode colorMode)
pdf.Append(' ');
pdf.Append(PdfEncoders.ToString(0.2 * pen.Width));
}
pdf.AppendFormat(CultureInfo.InvariantCulture, "]{0:" + format + "} d\n", pen.DashOffset * pen.Width);
pdf.AppendFormat(CultureInfo.InvariantCulture, "]{0:" + format3 + "} d", pen.DashOffset * pen.Width);
pdf.Append(renderer.Owner.Options.LineEnding);
string pattern = pdf.ToString();

// IMPROVE
Expand All @@ -168,23 +180,26 @@ public void RealizePen(XPen pen, PdfColorMode colorMode)
if (_realizedStrokeColor.Rgb != color.Rgb)
{
renderer.Append(PdfEncoders.ToString(color, PdfColorMode.Rgb));
renderer.Append(" RG\n");
renderer.Append(" RG");
renderer.Append(renderer.Owner.Options.LineEnding);
}
}
else
{
if (!ColorSpaceHelper.IsEqualCmyk(_realizedStrokeColor, color))
{
renderer.Append(PdfEncoders.ToString(color, PdfColorMode.Cmyk));
renderer.Append(" K\n");
renderer.Append(" K");
renderer.Append(renderer.Owner.Options.LineEnding);
}
}

if (renderer.Owner.Version >= 14 && (_realizedStrokeColor.A != color.A || _realizedStrokeOverPrint != overPrint))
{
PdfExtGState extGState = renderer.Owner.ExtGStateTable.GetExtGStateStroke(color.A, overPrint);
string gs = renderer.Resources.AddExtGState(extGState);
renderer.AppendFormatString("{0} gs\n", gs);
renderer.AppendFormatString("{0} gs", gs);
renderer.Append(renderer.Owner.Options.LineEnding);

// Must create transparency group.
if (renderer._page != null! && color.A < 1)
Expand Down Expand Up @@ -238,8 +253,10 @@ public void RealizeBrush(XBrush brush, PdfColorMode colorMode, int renderingMode
PdfShadingPattern pattern = new PdfShadingPattern(renderer.Owner);
pattern.SetupFromBrush(gradientBrush, matrix, renderer);
string name = renderer.Resources.AddPattern(pattern);
renderer.AppendFormatString("/Pattern cs\n", name);
renderer.AppendFormatString("{0} scn\n", name);
renderer.AppendFormatString("/Pattern cs", name);
renderer.Append(renderer.Owner.Options.LineEnding);
renderer.AppendFormatString("{0} scn", name);
renderer.Append(renderer.Owner.Options.LineEnding);

// Invalidate fill color.
_realizedFillColor = XColor.Empty;
Expand All @@ -256,7 +273,8 @@ void RealizeFillColor(XColor color, bool overPrint, PdfColorMode colorMode)
if (_realizedFillColor.IsEmpty || _realizedFillColor.Rgb != color.Rgb)
{
renderer.Append(PdfEncoders.ToString(color, PdfColorMode.Rgb));
renderer.Append(" rg\n");
renderer.Append(" rg");
renderer.Append(renderer.Owner.Options.LineEnding);
}
}
else
Expand All @@ -266,7 +284,8 @@ void RealizeFillColor(XColor color, bool overPrint, PdfColorMode colorMode)
if (_realizedFillColor.IsEmpty || !ColorSpaceHelper.IsEqualCmyk(_realizedFillColor, color))
{
renderer.Append(PdfEncoders.ToString(color, PdfColorMode.Cmyk));
renderer.Append(" k\n");
renderer.Append(" k");
renderer.Append(renderer.Owner.Options.LineEnding);
}
}

Expand All @@ -275,7 +294,8 @@ void RealizeFillColor(XColor color, bool overPrint, PdfColorMode colorMode)

PdfExtGState extGState = renderer.Owner.ExtGStateTable.GetExtGStateNonStroke(color.A, overPrint);
string gs = renderer.Resources.AddExtGState(extGState);
renderer.AppendFormatString("{0} gs\n", gs);
renderer.AppendFormatString("{0} gs", gs);
renderer.Append(renderer.Owner.Options.LineEnding);

// Must create transparency group.
// ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
Expand Down Expand Up @@ -307,15 +327,17 @@ internal void RealizeNonStrokeTransparency(double transparency, PdfColorMode col

public void RealizeFont(XGlyphTypeface glyphTypeface, double emSize, XBrush brush, int renderingMode, FontType fontType)
{
const string format = Config.SignificantDecimalPlaces3;
const string format3 = Config.SignificantDecimalPlaces3;
const string format = "{0} {1:" + format3 + "} Tf";

// So far rendering mode 0 (fill text) and 2 (fill, then stroke text) only.
RealizeBrush(brush, renderer._colorMode, renderingMode, emSize); // _renderer.page.document.Options.ColorMode);

// Realize rendering mode.
if (_realizedRenderingMode != renderingMode)
{
renderer.AppendFormatInt("{0} Tr\n", renderingMode);
renderer.AppendFormatInt("{0} Tr", renderingMode);
renderer.Append(renderer.Owner.Options.LineEnding);
_realizedRenderingMode = renderingMode;
}

Expand All @@ -324,7 +346,8 @@ public void RealizeFont(XGlyphTypeface glyphTypeface, double emSize, XBrush brus
{
if (_realizedCharSpace != 0)
{
renderer.Append("0 Tc\n");
renderer.Append("0 Tc");
renderer.Append(renderer.Owner.Options.LineEnding);
_realizedCharSpace = 0;
}
}
Expand All @@ -333,7 +356,8 @@ public void RealizeFont(XGlyphTypeface glyphTypeface, double emSize, XBrush brus
double charSpace = emSize * Const.BoldEmphasis;
if (_realizedCharSpace != charSpace)
{
renderer.AppendFormatDouble("{0:" + format + "} Tc\n", charSpace);
renderer.AppendFormatDouble("{0:" + format3 + "} Tc", charSpace);
renderer.Append(renderer.Owner.Options.LineEnding);
_realizedCharSpace = charSpace;
}
}
Expand All @@ -342,26 +366,24 @@ public void RealizeFont(XGlyphTypeface glyphTypeface, double emSize, XBrush brus
string fontName = renderer.GetFontName(glyphTypeface, fontType, out _realizedFont);
if (fontName != _realizedFontName || _realizedFontSize != emSize)
{
s_formatTf ??= "{0} {1:" + format + "} Tf\n";
if (renderer.Gfx.PageDirection == XPageDirection.Downwards)
{
// earlier:
// renderer.AppendFormatFont("{0} {1:" + format + "} Tf\n", fontName, emSize);
renderer.AppendFormatFont(s_formatTf, fontName, emSize);
renderer.AppendFormatFont(format, fontName, emSize);
renderer.Append(renderer.Owner.Options.LineEnding);
}
else
{
// earlier:
// renderer.AppendFormatFont("{0} {1:" + format + "} Tf\n", fontName, emSize);
renderer.AppendFormatFont(s_formatTf, fontName, emSize);
renderer.AppendFormatFont(format, fontName, emSize);
renderer.Append(renderer.Owner.Options.LineEnding);
}
_realizedFontName = fontName;
_realizedFontSize = emSize;
}
}
// ReSharper disable InconsistentNaming
static string? s_formatTf;
// ReSharper restore InconsistentNaming

public XPoint RealizedTextPosition;

Expand Down Expand Up @@ -445,21 +467,22 @@ public void AddTransform(XMatrix value, XMatrixOrder matrixOrder)
/// </summary>
public void RealizeCtm()
{
const string format7 = Config.SignificantDecimalPlaces7;
const string format = "{0:" + format7 + "} {1:" + format7 + "} {2:" + format7 + "} {3:" + format7 + "} {4:"
+ format7 + "} {5:" + format7 + "} cm";

//if (MustRealizeCtm)
if (!UnrealizedCtm.IsIdentity)
{
Debug.Assert(!UnrealizedCtm.IsIdentity, "mrCtm is unnecessarily set.");

const string format = Config.SignificantDecimalPlaces7;
s_formatCtm ??= "{0:" + format + "} {1:" + format + "} {2:" + format + "} {3:" + format + "} {4:"
+ format + "} {5:" + format + "} cm\n";

double[] matrix = UnrealizedCtm.GetElements();
// Use up to six decimal digits to prevent round up problems.
// earlier:
// renderer.AppendFormatArgs("{0:" + format + "} {1:" + format + "} {2:" + format + "} {3:" + format + "} {4:" + format + "} {5:" + format + "} cm\n",
// matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]);
renderer.AppendFormatArgs(s_formatCtm, matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]);
renderer.AppendFormatArgs(format, matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]);
renderer.Append(renderer.Owner.Options.LineEnding);

RealizedCtm.Prepend(UnrealizedCtm);
UnrealizedCtm = new XMatrix();
Expand All @@ -468,9 +491,6 @@ public void RealizeCtm()
InverseEffectiveCtm.Invert();
}
}
// ReSharper disable InconsistentNaming
static string? s_formatCtm;
// ReSharper restore InconsistentNaming
#endregion

#region Clip Path
Expand Down Expand Up @@ -519,7 +539,8 @@ void RealizeClipPath(XGraphicsPath clipPath)
else
renderer.AppendPath(clipPath._pathGeometry);
#endif
renderer.Append(clipPath.FillMode == XFillMode.Winding ? "W n\n" : "W* n\n");
renderer.Append(clipPath.FillMode == XFillMode.Winding ? "W n" : "W* n");
renderer.Append(renderer.Owner.Options.LineEnding);
}

#endregion
Expand Down
Loading