Added the ability to create an XPen that uses an XBrush (instead of XColor) so XPens can have gradients;

Author: baskren

PdfSharpCore/Drawing.Pdf/PdfGraphicsState.cs

@@ -197,7 +197,11 @@ public void RealizePen(XPen pen, PdfColorMode colorMode)
                 _realizedDashStyle = dashStyle;
             }
 
-            if (colorMode != PdfColorMode.Cmyk)
+            if (pen.Brush != null)
+            {
+                RealizeBrush(pen.Brush, colorMode, 0, 0, true);
+            }
+            else if (colorMode != PdfColorMode.Cmyk)
             {
                 if (_realizedStrokeColor.Rgb != color.Rgb)
                 {
@@ -235,7 +239,7 @@ public void RealizePen(XPen pen, PdfColorMode colorMode)
         XColor _realizedFillColor = XColor.Empty;
         bool _realizedNonStrokeOverPrint;
 
-        public void RealizeBrush(XBrush brush, PdfColorMode colorMode, int renderingMode, double fontEmSize)
+        public void RealizeBrush(XBrush brush, PdfColorMode colorMode, int renderingMode, double fontEmSize, bool isForPen = false)
         {
             // Rendering mode 2 is used for bold simulation.
             // Reference: TABLE 5.3  Text rendering modes / Page 402
@@ -273,9 +277,16 @@ 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);
-
+                    if (isForPen)
+                    {
+                        _renderer.AppendFormatString("/Pattern CS\n", name);
+                        _renderer.AppendFormatString("{0} SCN\n", name);
+                    }
+                    else
+                    {
+                        _renderer.AppendFormatString("/Pattern cs\n", name);
+                        _renderer.AppendFormatString("{0} scn\n", name);
+                    }
                     // Invalidate fill color.
                     _realizedFillColor = XColor.Empty;
                 }

PdfSharpCore/Drawing/XPen.cs

@@ -76,6 +76,30 @@ internal XPen(XColor color, double width, bool immutable)
             _immutable = immutable;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XPen"/> class
+        /// </summary>
+        /// <param name="brush"></param>
+        public XPen(XBrush brush) : this(brush, 1, false) { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XPen"/> class
+        /// </summary>
+        /// <param name="brush"></param>
+        /// <param name="width"></param>
+        public XPen(XBrush brush, double width) : this(brush, width, false) { }
+
+        internal XPen(XBrush brush, double width, bool immutable)
+        {
+            _brush = brush;
+            _width = width;
+            _lineJoin = XLineJoin.Miter;
+            _lineCap = XLineCap.Flat;
+            _dashStyle = XDashStyle.Solid;
+            _dashOffset = 0f;
+            _immutable = immutable;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="XPen"/> class.
         /// </summary>
@@ -100,6 +124,20 @@ public XPen Clone()
             return new XPen(this);
         }
 
+        public XBrush Brush
+        {
+            get => _brush;
+            set
+            {
+                if (_immutable)
+                    throw new ArgumentException(PSSR.CannotChangeImmutableObject("XPen"));
+                _dirty = _dirty || _brush != value;
+                _brush = value;
+                _color = XColor.Empty;
+            }
+        }
+        internal XBrush _brush;
+
         /// <summary>
         /// Gets or sets the color.
         /// </summary>
@@ -112,6 +150,7 @@ public XColor Color
                     throw new ArgumentException(PSSR.CannotChangeImmutableObject("XPen"));
                 _dirty = _dirty || _color != value;
                 _color = value;
+                _brush = null;
             }
         }
         internal XColor _color;

PdfSharpCore/Pdf.Internal/PdfEncoders.cs

@@ -426,7 +426,7 @@ public static byte[] FormatStringLiteral(byte[] bytes, bool unicode, bool prefix
         }
 
         /// <summary>
-        /// Converts WinAnsi to DocEncode characters. Incomplete, just maps € and some other characters.
+        /// Converts WinAnsi to DocEncode characters. Incomplete, just maps ? and some other characters.
         /// </summary>
         static byte[] docencode_______ = new byte[256]
         {
@@ -605,8 +605,8 @@ public static string ToString(XColor color, PdfColorMode colorMode)
                       color.C, color.M, color.Y, color.K);
 
                 default:
-                    return String.Format(CultureInfo.InvariantCulture, "{0:" + format + "} {1:" + format + "} {2:" + format + "}",
-                      color.R / 255.0, color.G / 255.0, color.B / 255.0);
+                    return String.Format(CultureInfo.InvariantCulture, "{0:" + format + "} {1:" + format + "} {2:" + format + "} {3:" + format + "}",
+                      color.R / 255.0, color.G / 255.0, color.B / 255.0, color.A);
             }
         }