Gradient fills clip to the path and paint a native shading; gradient + * strokes set a shading-pattern stroking colour (pattern type 2) so the + * outline itself carries the gradient. Flat-colour paths bypass both and + * take the exact pre-gradient code path, byte for byte.
+ * * @author Artem Demchyshyn * @since 1.8.0 */ @@ -41,8 +47,51 @@ public void render(PlacedFragment fragment, float y = (float) fragment.y(); float width = (float) fragment.width(); float height = (float) fragment.height(); - PdfShapeGeometry.fillAndStrokePath(stream, payload.fillColor(), payload.stroke(), - payload.dashPattern(), - s -> PdfShapeGeometry.addPathSegments(s, x, y, width, height, payload.segments())); + + if (payload.fillPaint() == null && payload.strokePaint() == null) { + PdfShapeGeometry.fillAndStrokePath(stream, payload.fillColor(), payload.stroke(), + payload.dashPattern(), + s -> PdfShapeGeometry.addPathSegments(s, x, y, width, height, payload.segments())); + return; + } + + // Gradient route: fill and stroke are separate passes because each + // may independently be a flat colour or a shading. + stream.saveGraphicsState(); + try { + if (payload.fillPaint() != null) { + // Clip in a nested state so the clip never leaks into the + // stroke pass (mirrors the shape handler). + stream.saveGraphicsState(); + try { + PdfShapeGeometry.addPathSegments(stream, x, y, width, height, payload.segments()); + stream.clip(); + stream.shadingFill(PdfShadingSupport.build(payload.fillPaint(), x, y, width, height)); + } finally { + stream.restoreGraphicsState(); + } + } else if (payload.fillColor() != null) { + PdfShapeGeometry.fillAndStrokePath(stream, payload.fillColor(), null, null, + s -> PdfShapeGeometry.addPathSegments(s, x, y, width, height, payload.segments())); + } + + boolean hasStrokeWidth = payload.stroke() != null && payload.stroke().width() > 0; + if (payload.strokePaint() != null && hasStrokeWidth) { + PDResources resources = environment.document() + .getPage(fragment.pageIndex()).getResources(); + stream.setStrokingColor(PdfShadingSupport.strokePattern( + payload.strokePaint(), resources, x, y, width, height)); + stream.setLineWidth((float) payload.stroke().width()); + PdfShapeGeometry.applyDashPattern(stream, payload.dashPattern()); + PdfShapeGeometry.addPathSegments(stream, x, y, width, height, payload.segments()); + stream.stroke(); + } else if (hasStrokeWidth && payload.stroke().strokeColor() != null) { + PdfShapeGeometry.fillAndStrokePath(stream, null, payload.stroke(), + payload.dashPattern(), + s -> PdfShapeGeometry.addPathSegments(s, x, y, width, height, payload.segments())); + } + } finally { + stream.restoreGraphicsState(); + } } } diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShadingSupport.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShadingSupport.java index 3b32b7f71..fabee258d 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShadingSupport.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShadingSupport.java @@ -2,10 +2,14 @@ import com.demcha.compose.document.style.DocumentPaint; import org.apache.pdfbox.cos.*; +import org.apache.pdfbox.pdmodel.PDResources; import org.apache.pdfbox.pdmodel.common.function.PDFunction; import org.apache.pdfbox.pdmodel.common.function.PDFunctionType2; import org.apache.pdfbox.pdmodel.common.function.PDFunctionType3; +import org.apache.pdfbox.pdmodel.graphics.color.PDColor; import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB; +import org.apache.pdfbox.pdmodel.graphics.color.PDPattern; +import org.apache.pdfbox.pdmodel.graphics.pattern.PDShadingPattern; import org.apache.pdfbox.pdmodel.graphics.shading.PDShading; import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingType2; import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingType3; @@ -22,8 +26,12 @@ * the paint's angle (0° = left→right, 90° = bottom→top), long enough to cover * the whole box; a {@link DocumentPaint.Radial} maps to {@code /ShadingType 3} * centred at the paint's normalized centre with a radius reaching the farthest - * box corner. Two stops become one exponential function; more stops become a - * stitching function over evenly encoded sub-intervals. + * box corner. {@link DocumentPaint.LinearAxis} carries explicit normalized + * endpoints and {@link DocumentPaint.RadialCircle} an explicit centre plus + * radius (a fraction of the box width); both translate verbatim — that is the + * exact-extent path SVG gradients ride in on. Two stops become one + * exponential function; more stops become a stitching function over evenly + * encoded sub-intervals. * * @author Artem Demchyshyn * @since 1.8.0 @@ -52,10 +60,95 @@ static PDShading build(DocumentPaint paint, float x, float y, float width, float if (paint instanceof DocumentPaint.Radial radial) { return radial(radial, x, y, width, height); } + if (paint instanceof DocumentPaint.LinearAxis axis) { + return axialFromEndpoints(axis, x, y, width, height); + } + if (paint instanceof DocumentPaint.RadialCircle circle) { + return radialFromCircle(circle, x, y, width, height); + } throw new IllegalArgumentException( "solid paints are normalised before emission and never reach the shading path"); } + /** + * Wraps the shading for a gradient paint in a PDF shading pattern + * (pattern type 2) registered on the page resources, returning the + * pattern colour to use as a stroking colour. Pattern space is the + * default page space, which matches the absolute coordinates + * {@link #build} already emits — no pattern matrix needed. + * + * @param paint gradient paint + * @param resources page resources the pattern registers on + * @param x box left, page coordinates + * @param y box bottom, page coordinates + * @param width box width + * @param height box height + * @return pattern colour for {@code setStrokingColor} + */ + static PDColor strokePattern(DocumentPaint paint, PDResources resources, + float x, float y, float width, float height) { + PDShadingPattern pattern = new PDShadingPattern(); + PDShading shading = build(paint, x, y, width, height); + // Inline the whole shading subtree (dict, function, stitching + // sub-functions): nested free-standing dicts would be promoted to + // indirect objects the writer never emits, leaving /Shading and + // /Function dangling as null references after reload. + inlineDeep(shading.getCOSObject()); + pattern.setShading(shading); + COSName name = resources.add(pattern); + return new PDColor(name, new PDPattern(null)); + } + + private static void inlineDeep(COSBase base) { + if (base instanceof COSDictionary dict) { + dict.setDirect(true); + for (COSBase value : dict.getValues()) { + inlineDeep(value); + } + } else if (base instanceof COSArray array) { + array.setDirect(true); + for (COSBase item : array) { + inlineDeep(item); + } + } + } + + private static PDShading axialFromEndpoints(DocumentPaint.LinearAxis axis, + float x, float y, float width, float height) { + PDShadingType2 shading = new PDShadingType2(new COSDictionary()); + shading.setShadingType(PDShading.SHADING_TYPE2); + shading.setColorSpace(PDDeviceRGB.INSTANCE); + COSArray coords = new COSArray(); + coords.add(new COSFloat((float) (x + axis.x0() * width))); + coords.add(new COSFloat((float) (y + axis.y0() * height))); + coords.add(new COSFloat((float) (x + axis.x1() * width))); + coords.add(new COSFloat((float) (y + axis.y1() * height))); + shading.setCoords(coords); + shading.setFunction(stopsFunction(axis.stops())); + shading.setExtend(bothExtend()); + return shading; + } + + private static PDShading radialFromCircle(DocumentPaint.RadialCircle circle, + float x, float y, float width, float height) { + // Radius scales by width per the RadialCircle contract; with the + // aspect-preserving icon frame this keeps circles circular. + PDShadingType3 shading = new PDShadingType3(new COSDictionary()); + shading.setShadingType(PDShading.SHADING_TYPE3); + shading.setColorSpace(PDDeviceRGB.INSTANCE); + COSArray coords = new COSArray(); + coords.add(new COSFloat((float) (x + circle.cx() * width))); + coords.add(new COSFloat((float) (y + circle.cy() * height))); + coords.add(new COSFloat(0f)); + coords.add(new COSFloat((float) (x + circle.cx() * width))); + coords.add(new COSFloat((float) (y + circle.cy() * height))); + coords.add(new COSFloat((float) (circle.r() * width))); + shading.setCoords(coords); + shading.setFunction(stopsFunction(circle.stops())); + shading.setExtend(bothExtend()); + return shading; + } + private static PDShading axial(DocumentPaint.Linear linear, float x, float y, float width, float height) { double radians = Math.toRadians(linear.angleDegrees()); diff --git a/src/main/java/com/demcha/compose/document/dsl/AbstractFlowBuilder.java b/src/main/java/com/demcha/compose/document/dsl/AbstractFlowBuilder.java index 713e3c134..8f7a23bd9 100644 --- a/src/main/java/com/demcha/compose/document/dsl/AbstractFlowBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/AbstractFlowBuilder.java @@ -556,19 +556,7 @@ public T addPath(ConsumerSolid paints never travel here — the definition normalises them into + * {@code fillColor} / the stroke colour, so only true gradients reach the + * handler and flat-colour output stays byte-identical.
+ * * @param segments normalized path segments, starting with a move-to * @param fillColor optional fill color (non-zero winding rule) + * @param fillPaint optional gradient fill; wins over {@code fillColor} * @param stroke optional stroke + * @param strokePaint optional gradient stroke paint; the stroke still + * supplies the width * @param linkOptions optional fragment-level link metadata * @param bookmarkOptions optional fragment-level bookmark metadata * @param dashPattern dash pattern for the stroke; @@ -29,7 +37,9 @@ public record PathFragmentPayload( ListFills and strokes each take an optional gradient: {@code fillPaint} + * wins over {@code fillColor}, and {@code strokePaint} paints the outline + * through a PDF shading pattern while {@code stroke} keeps supplying the + * width (and the flat-colour fallback for backends without gradients).
+ * + * @param name node name used in snapshots and layout graph paths + * @param width resolved box width + * @param height resolved box height + * @param segments normalized path segments; must start with a + * {@link DocumentPathSegment.MoveTo} + * @param fillColor optional fill colour (non-zero winding rule) + * @param fillPaint optional gradient fill; wins over {@code fillColor} + * @param stroke optional outline stroke + * @param strokePaint optional gradient for the outline; requires + * {@code stroke} for the width * @param padding inner padding * @param margin outer margin * @param dashPattern dash pattern for the stroke; defaults to @@ -42,13 +51,16 @@ public record PathNode( double height, ListCoordinate mapping follows the SVG gradient units: {@code + * objectBoundingBox} (the default) maps endpoints through the referencing + * shape's normalized bounding box, {@code userSpaceOnUse} pushes them + * through the element's accumulated affine and the icon frame — the same + * pipeline the geometry itself rides, so a gradient lands exactly where the + * browser puts it. {@code gradientTransform} (the affine subset: + * translate / scale / rotate / matrix) applies to the endpoints first. + * One level of {@code href} / {@code xlink:href} indirection supplies + * stops for the split-definition style Inkscape and Figma emit.
+ * + *Out of PDF reach and loudly refused: focal radials ({@code fx} / + * {@code fy}), {@code spreadMethod} other than pad, and translucent stops + * ({@code stop-opacity}).
+ */ +final class SvgGradients { + + private SvgGradients() { + } + + /** + * Collects every gradient definition in the document by id, wherever it + * sits (the {@codeEach layer is one {@link SvgPath} with its resolved paint, in document - * order — render them back-to-front. The DSL does exactly that: - * {@code flow.addSvgIcon(icon, 48)} stacks the layers into the page at the + * order — render them back-to-front. {@link #node(double)} packages the + * layers as one ready-to-place node, and the DSL sugar + * {@code flow.addSvgIcon(icon, 48)} drops that node into the page at the * requested width with the icon's own aspect ratio.
* *Out of scope (deliberately, this is an icon reader, not a browser): - * gradients, CSS stylesheets and classes, text, masks, clip paths, - * filters, {@code
+ * CSS stylesheets and classes, text, masks, clip paths, filters, + * {@code