From fb7fc0edf16bd66670b034c32d67f6a9b61cc223 Mon Sep 17 00:00:00 2001 From: DemchaAV Date: Sat, 30 May 2026 01:36:41 +0100 Subject: [PATCH 1/4] feat(cv-v2): add Mint Editorial preset + paired cover letter Two-page two-column editorial CV ported from the Mint Editorial design: centered spaced-caps masthead with a full-width mint accent rule, a left sidebar (contact icon rows, interests, education, expertise, level-driven skill bars, social) beside a main column (profile, experience, awards and references two-column grids). MintEditorialLetter reuses the same theme and masthead 1:1. Layered additions: - data: CvSkill(name, optional level) + SkillGroup leveled entries, backward-compatible (name-only renderers and existing baselines unchanged). - theme: CvTheme.mintEditorial() (Poppins; mint accent in palette.banner()). - widgets: reusable SkillBar (proficiency bar) and IconTextRow. - presets: MintEditorial (cv/v2) + MintEditorialLetter (coverletter/v2). - examples: Rose Harris showcase dataset, local to the Mint example so the shared sampleCvDocumentV2 stays untouched. Local checkpoint of the visually-approved render. Parity 15/15 (no baseline drift), Mint + widget + skills smoke tests green, full verify passes. Follow-ups: parity baseline registration, docs/CHANGELOG, customizable accent/header colour options. --- .../examples/support/ExampleDataFactory.java | 180 +++- ...CoverLetterTemplateGalleryFileExample.java | 10 +- .../v2/CvMintEditorialLetterV2Example.java | 47 + .../cv/CvTemplateGalleryFileExample.java | 8 +- .../cv/v2/CvMintEditorialExample.java | 86 ++ .../v2/presets/MintEditorialLetter.java | 133 +++ .../templates/cv/v2/data/CvSkill.java | 50 + .../templates/cv/v2/data/SkillGroup.java | 66 +- .../templates/cv/v2/data/SkillsSection.java | 16 +- .../cv/v2/presets/MintEditorial.java | 934 ++++++++++++++++++ .../templates/cv/v2/theme/CvPalette.java | 18 + .../templates/cv/v2/theme/CvSpacing.java | 26 + .../templates/cv/v2/theme/CvTheme.java | 18 + .../templates/cv/v2/theme/CvTypography.java | 19 + .../templates/cv/v2/widgets/IconTextRow.java | 92 ++ .../templates/cv/v2/widgets/SkillBar.java | 134 +++ .../cv/mint-editorial/icons/email.png | Bin 0 -> 941 bytes .../mint-editorial/icons/expertise-badge.png | Bin 0 -> 4440 bytes .../cv/mint-editorial/icons/facebook.png | Bin 0 -> 1838 bytes .../cv/mint-editorial/icons/linkedin.png | Bin 0 -> 2060 bytes .../cv/mint-editorial/icons/location.png | Bin 0 -> 1497 bytes .../cv/mint-editorial/icons/phone.png | Bin 0 -> 1241 bytes .../cv/mint-editorial/icons/pinterest.png | Bin 0 -> 2558 bytes .../cv/mint-editorial/icons/twitter.png | Bin 0 -> 2263 bytes .../cv/mint-editorial/icons/website.png | Bin 0 -> 1906 bytes .../v2/presets/CoverLetterV2SmokeTest.java | 4 +- .../cv/v2/data/SkillsSectionTest.java | 27 +- .../cv/v2/presets/CvV2VisualParityTest.java | 64 +- .../cv/v2/presets/MintEditorialSmokeTest.java | 168 ++++ .../cv/v2/widgets/WidgetSmokeTest.java | 35 + 30 files changed, 2074 insertions(+), 61 deletions(-) create mode 100644 examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvMintEditorialLetterV2Example.java create mode 100644 examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMintEditorialExample.java create mode 100644 src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java create mode 100644 src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvSkill.java create mode 100644 src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorial.java create mode 100644 src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/IconTextRow.java create mode 100644 src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SkillBar.java create mode 100644 src/main/resources/templates/cv/mint-editorial/icons/email.png create mode 100644 src/main/resources/templates/cv/mint-editorial/icons/expertise-badge.png create mode 100644 src/main/resources/templates/cv/mint-editorial/icons/facebook.png create mode 100644 src/main/resources/templates/cv/mint-editorial/icons/linkedin.png create mode 100644 src/main/resources/templates/cv/mint-editorial/icons/location.png create mode 100644 src/main/resources/templates/cv/mint-editorial/icons/phone.png create mode 100644 src/main/resources/templates/cv/mint-editorial/icons/pinterest.png create mode 100644 src/main/resources/templates/cv/mint-editorial/icons/twitter.png create mode 100644 src/main/resources/templates/cv/mint-editorial/icons/website.png create mode 100644 src/test/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorialSmokeTest.java diff --git a/examples/src/main/java/com/demcha/examples/support/ExampleDataFactory.java b/examples/src/main/java/com/demcha/examples/support/ExampleDataFactory.java index f1893ae6..7037eb39 100644 --- a/examples/src/main/java/com/demcha/examples/support/ExampleDataFactory.java +++ b/examples/src/main/java/com/demcha/examples/support/ExampleDataFactory.java @@ -15,6 +15,7 @@ import com.demcha.compose.document.templates.cv.spec.CvSpec; import com.demcha.compose.document.templates.cv.v2.data.CvDocument; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.v2.data.CvSkill; import com.demcha.compose.document.templates.cv.v2.data.EntriesSection; import com.demcha.compose.document.templates.cv.v2.data.ParagraphSection; import com.demcha.compose.document.templates.cv.v2.data.RowStyle; @@ -529,25 +530,50 @@ public static CvDocument sampleCvDocumentV2() { + "DSLs, and turning brittle production-ops scripts " + "into typed, snapshot-tested libraries that scale."); + // Skill names are unchanged from the name-only form; only optional + // proficiency levels are added so data-driven presets (e.g. Mint + // Editorial's SkillBar) can render meters. Name-only presets read + // SkillGroup.skills() and are unaffected by the added levels. SkillsSection skills = SkillsSection .builder("Technical Skills") - .group("Languages", "Java 21", "Kotlin", "Groovy", - "Python", "SQL") - .group("Document & Print", "PDFBox", - "Apache POI (DOCX/XLSX)", "iText", "PostScript", - "ICC colour profiles", "font metrics") - .group("Layout engines", "Custom DSL design", - "semantic layout trees", "pagination", - "snapshot testing", "visual regression") - .group("Build & infrastructure", "Maven", "Gradle", - "GitHub Actions", "JitPack", "Docker", - "JMH benchmarking") - .group("Testing", "JUnit 5", "AssertJ", - "PDFBox-based PNG diff", "layout-graph snapshots", - "mutation testing (Pitest)") - .group("Distribution", "Maven Central", "Sonatype OSSRH", - "GPG signing", "JitPack", - "semantic versioning discipline") + .leveledGroup("Languages", List.of( + CvSkill.of("Java 21", 0.95), + CvSkill.of("Kotlin", 0.85), + CvSkill.of("Groovy", 0.7), + CvSkill.of("Python", 0.75), + CvSkill.of("SQL", 0.8))) + .leveledGroup("Document & Print", List.of( + CvSkill.of("PDFBox", 0.9), + CvSkill.of("Apache POI (DOCX/XLSX)", 0.7), + CvSkill.of("iText", 0.65), + CvSkill.of("PostScript", 0.6), + CvSkill.of("ICC colour profiles", 0.55), + CvSkill.of("font metrics", 0.7))) + .leveledGroup("Layout engines", List.of( + CvSkill.of("Custom DSL design", 0.9), + CvSkill.of("semantic layout trees", 0.85), + CvSkill.of("pagination", 0.85), + CvSkill.of("snapshot testing", 0.8), + CvSkill.of("visual regression", 0.8))) + .leveledGroup("Build & infrastructure", List.of( + CvSkill.of("Maven", 0.9), + CvSkill.of("Gradle", 0.75), + CvSkill.of("GitHub Actions", 0.85), + CvSkill.of("JitPack", 0.8), + CvSkill.of("Docker", 0.7), + CvSkill.of("JMH benchmarking", 0.65))) + .leveledGroup("Testing", List.of( + CvSkill.of("JUnit 5", 0.9), + CvSkill.of("AssertJ", 0.85), + CvSkill.of("PDFBox-based PNG diff", 0.8), + CvSkill.of("layout-graph snapshots", 0.8), + CvSkill.of("mutation testing (Pitest)", 0.6))) + .leveledGroup("Distribution", List.of( + CvSkill.of("Maven Central", 0.8), + CvSkill.of("Sonatype OSSRH", 0.75), + CvSkill.of("GPG signing", 0.7), + CvSkill.of("JitPack", 0.8), + CvSkill.of("semantic versioning discipline", 0.85))) .build(); EntriesSection education = EntriesSection @@ -635,4 +661,124 @@ public static CvDocument sampleCvDocumentV2() { .sections(summary, skills, education, projects, experience, additional) .build(); } + + /** + * Rich "Rose Harris" CV document used only by + * {@code CvMintEditorialExample} to reproduce the Mint Editorial visual + * reference 1:1. Kept separate from {@link #sampleCvDocumentV2()} so the + * shared canonical sample — and therefore every other preset's visual + * baseline — stays untouched. + * + *

All sections live in {@code Slot.MAIN}; the Mint preset routes each + * to its sidebar/main region by title keyword. Section titles are chosen + * to match the preset's lookup constants: "Interests" → Interests, + * "Education" → Education, "Technical Skills" → both Expertise (group + * categories) and Skills (leveled entries), "Profile" → Profile, + * "Experience" → Experience, "Awards" → Awards, "References" → + * References.

+ * + *

Expertise and Skills are both derived from the single + * {@code Technical Skills} section: the preset reads the group + * categories as the Expertise label list and the flattened + * leveled entries as the proficiency bars. Each Expertise + * category therefore carries one leveled skill so both lists render as in + * the reference.

+ * + * @return rich Rose Harris CV document for the Mint Editorial showcase + */ + public static CvDocument mintEditorialShowcaseCv() { + CvIdentity identity = CvIdentity.builder() + .name("Rose", "Harris") + .jobTitle("Graphic Designer") + .contact("+61 409 298 398", "hello@email.com", "Sydney, AUS") + .link("www.website.com", "https://www.website.com") + .link("Twitter", "https://twitter.com/roseharris") + .link("Facebook", "https://facebook.com/roseharris") + .link("Pinterest", "https://pinterest.com/roseharris") + .link("LinkedIn", "https://linkedin.com/in/roseharris") + .build(); + + ParagraphSection profile = new ParagraphSection("Profile", + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. " + + "Donec vulputate, lectus a tincidunt molestie, justo " + + "lectus posuere magnum, sed pretium nisi metus a " + + "risus. Vivamus tincidunt ligula in lacus euismod, " + + "ut tincidunt velit vestibulum. Suspendisse potenti. " + + "Praesent placerat lectus vitae ipsum pellentesque " + + "molestie."); + + RowsSection interests = RowsSection + .builder("Interests", RowStyle.PLAIN) + .row("Politics", "") + .row("Travelling", "") + .row("Arts & Entertainment", "") + .row("Illustration", "") + .build(); + + EntriesSection education = EntriesSection + .builder("Education") + .entry("Degree/Bachelor", "University of Sydney", "2010 - 2011", "") + .entry("Degree/Bachelor", "University of Sydney", "2010 - 2011", "") + .entry("Degree/Bachelor", "University of Sydney", "2010 - 2011", "") + .build(); + + // Single skills section feeds BOTH Expertise (group categories) and + // Skills (flattened leveled entries). Each Expertise category carries + // one leveled skill so the two reference lists render independently. + SkillsSection skills = SkillsSection + .builder("Technical Skills") + .leveledGroup("Illustration", + List.of(CvSkill.of("Social Media", 0.45))) + .leveledGroup("Print Design", + List.of(CvSkill.of("Adobe Suite", 0.58))) + .leveledGroup("Branding", + List.of(CvSkill.of("Microsoft Word", 0.5))) + .leveledGroup("Animation", + List.of(CvSkill.of("HTML/CSS", 0.42))) + .leveledGroup("Web Design", + List.of(CvSkill.of("Wordpress", 0.6))) + .build(); + + String experienceBody = + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. " + + "Donec vulputate, lectus a tincidunt molestie, justo " + + "lectus posuere magnum, sed pretium nisi metus a risus.\n" + + "- Praesent placerat lectus vitae ipsum pellentesque\n" + + "- Vivamus tincidunt ligula in lacus euismod\n" + + "- Suspendisse potenti nullam ac tortor vitae"; + // Three entries so the Mint preset's 2-on-page-1 / rest-on-page-2 + // split renders two jobs under EXPERIENCE on page 1 and one + // continued job atop the page-2 main column, matching the reference. + EntriesSection experience = EntriesSection + .builder("Experience") + .entry("Job Title", "Company | Location", "2010 - Present", + experienceBody) + .entry("Job Title", "Company | Location", "2010 - Present", + experienceBody) + .entry("Job Title", "Company | Location", "2010 - Present", + experienceBody) + .build(); + + RowsSection awards = RowsSection + .builder("Awards", RowStyle.PLAIN) + .row("Award Name Here", "Company | 2012") + .row("Award Name Here", "Company | 2012") + .row("Award Name Here", "Company | 2012") + .row("Award Name Here", "Company | 2012") + .build(); + + RowsSection references = RowsSection + .builder("References", RowStyle.PLAIN) + .row("John Smith", "Company\nP: +61 402 938 209\nhello@email.com") + .row("John Smith", "Company\nP: +61 402 938 209\nhello@email.com") + .row("John Smith", "Company\nP: +61 402 938 209\nhello@email.com") + .row("John Smith", "Company\nP: +61 402 938 209\nhello@email.com") + .build(); + + return CvDocument.builder() + .identity(identity) + .sections(profile, interests, education, skills, experience, + awards, references) + .build(); + } } diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/CoverLetterTemplateGalleryFileExample.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/CoverLetterTemplateGalleryFileExample.java index 1f110bb2..966b6e28 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/CoverLetterTemplateGalleryFileExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/CoverLetterTemplateGalleryFileExample.java @@ -13,6 +13,7 @@ import com.demcha.compose.document.templates.coverletter.v2.presets.EditorialBlueLetter; import com.demcha.compose.document.templates.coverletter.v2.presets.EngineeringResumeLetter; import com.demcha.compose.document.templates.coverletter.v2.presets.ExecutiveLetter; +import com.demcha.compose.document.templates.coverletter.v2.presets.MintEditorialLetter; import com.demcha.compose.document.templates.coverletter.v2.presets.ModernProfessionalLetter; import com.demcha.compose.document.templates.coverletter.v2.presets.MonogramSidebarLetter; import com.demcha.compose.document.templates.coverletter.v2.presets.NordicCleanLetter; @@ -28,14 +29,14 @@ import java.util.function.Supplier; /** - * Renders all 14 layered cover-letter presets ({@code + * Renders all 15 layered cover-letter presets ({@code * coverletter.v2.presets.*} — the polished current standard) against * the same shared sample {@link CoverLetterDocument}. Each PDF lands in * {@code examples/target/generated-pdfs/templates/coverletter/cover-letter-.pdf} * where {@code } is the paired CV preset's stable identifier (e.g. * {@code cover-letter-modern-professional.pdf}). * - *

The 14 letter renders match the 14 CV renders in + *

The 15 letter renders match the 15 CV renders in * {@link com.demcha.examples.templates.cv.CvTemplateGalleryFileExample} * — a writer can render both galleries and pick a CV / cover-letter * pair sharing the same visual signature.

@@ -46,7 +47,7 @@ private CoverLetterTemplateGalleryFileExample() { } /** - * Renders all 14 layered cover-letter preset gallery PDFs. + * Renders all 15 layered cover-letter preset gallery PDFs. * * @return list of absolute paths of the rendered PDFs in source * order @@ -82,7 +83,8 @@ public static List generate(String presetId) throws Exception { run("editorial-blue", EditorialBlueLetter.RECOMMENDED_MARGIN, EditorialBlueLetter::create), run("panel", PanelLetter.RECOMMENDED_MARGIN, PanelLetter::create), run("sidebar-portrait", SidebarPortraitLetter.RECOMMENDED_MARGIN, SidebarPortraitLetter::create), - run("monogram-sidebar", MonogramSidebarLetter.RECOMMENDED_MARGIN, MonogramSidebarLetter::create)); + run("monogram-sidebar", MonogramSidebarLetter.RECOMMENDED_MARGIN, MonogramSidebarLetter::create), + run("mint-editorial", MintEditorialLetter.RECOMMENDED_MARGIN, MintEditorialLetter::create)); CoverLetterDocument doc = ExampleDataFactory.sampleCoverLetterDocumentV2(); List generated = new ArrayList<>(); diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvMintEditorialLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvMintEditorialLetterV2Example.java new file mode 100644 index 00000000..73c686d6 --- /dev/null +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvMintEditorialLetterV2Example.java @@ -0,0 +1,47 @@ +package com.demcha.examples.templates.coverletter.v2; + +import com.demcha.compose.GraphCompose; +import com.demcha.compose.document.api.DocumentPageSize; +import com.demcha.compose.document.api.DocumentSession; +import com.demcha.compose.document.templates.api.DocumentTemplate; +import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.v2.presets.MintEditorialLetter; +import com.demcha.examples.support.ExampleDataFactory; +import com.demcha.examples.support.ExampleOutputPaths; + +import java.nio.file.Path; + +/** + * Renders the v2 Mint Editorial cover-letter preset — the CV's centred + * spaced-caps masthead and mint accent rule reused 1:1, then a + * single-column letter body. Pair with {@code CvMintEditorialExample}. + * + *

Output: + * {@code examples/target/generated-pdfs/templates/coverletter/cover-letter-mint-editorial-v2.pdf}.

+ */ +public final class CvMintEditorialLetterV2Example { + + private CvMintEditorialLetterV2Example() { + } + + public static Path generate() throws Exception { + Path outputFile = ExampleOutputPaths.prepare( + "templates/coverletter", "cover-letter-mint-editorial-v2.pdf"); + CoverLetterDocument doc = ExampleDataFactory.sampleCoverLetterDocumentV2(); + DocumentTemplate template = MintEditorialLetter.create(); + + float m = (float) MintEditorialLetter.RECOMMENDED_MARGIN; + try (DocumentSession document = GraphCompose.document(outputFile) + .pageSize(DocumentPageSize.A4) + .margin(m, m, m, m) + .create()) { + template.compose(document, doc); + document.buildPdf(); + } + return outputFile; + } + + public static void main(String[] args) throws Exception { + System.out.println("Generated: " + generate()); + } +} diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/CvTemplateGalleryFileExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/CvTemplateGalleryFileExample.java index 5ecce10d..013d85cd 100644 --- a/examples/src/main/java/com/demcha/examples/templates/cv/CvTemplateGalleryFileExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/cv/CvTemplateGalleryFileExample.java @@ -13,6 +13,7 @@ import com.demcha.compose.document.templates.cv.v2.presets.EditorialBlue; import com.demcha.compose.document.templates.cv.v2.presets.EngineeringResume; import com.demcha.compose.document.templates.cv.v2.presets.Executive; +import com.demcha.compose.document.templates.cv.v2.presets.MintEditorial; import com.demcha.compose.document.templates.cv.v2.presets.ModernProfessional; import com.demcha.compose.document.templates.cv.v2.presets.MonogramSidebar; import com.demcha.compose.document.templates.cv.v2.presets.NordicClean; @@ -28,7 +29,7 @@ import java.util.function.Supplier; /** - * Renders all 14 layered CV presets ({@code cv.v2.presets.*} — the + * Renders all 15 layered CV presets ({@code cv.v2.presets.*} — the * polished current standard) against the same shared sample * {@link CvDocument}. Each PDF lands in * {@code examples/target/generated-pdfs/templates/cv/cv-.pdf} @@ -45,7 +46,7 @@ private CvTemplateGalleryFileExample() { } /** - * Renders all 14 layered CV preset gallery PDFs. + * Renders all 15 layered CV preset gallery PDFs. * * @return list of absolute paths of the rendered PDFs in source * order @@ -79,7 +80,8 @@ public static List generate(String presetId) throws Exception { run(EditorialBlue.ID, EditorialBlue.RECOMMENDED_MARGIN, EditorialBlue::create), run(Panel.ID, Panel.RECOMMENDED_MARGIN, Panel::create), run(SidebarPortrait.ID, SidebarPortrait.RECOMMENDED_MARGIN, SidebarPortrait::create), - run(MonogramSidebar.ID, MonogramSidebar.RECOMMENDED_MARGIN, MonogramSidebar::create)); + run(MonogramSidebar.ID, MonogramSidebar.RECOMMENDED_MARGIN, MonogramSidebar::create), + run(MintEditorial.ID, MintEditorial.RECOMMENDED_MARGIN, MintEditorial::create)); CvDocument doc = ExampleDataFactory.sampleCvDocumentV2(); List generated = new ArrayList<>(); diff --git a/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMintEditorialExample.java b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMintEditorialExample.java new file mode 100644 index 00000000..8cd244ad --- /dev/null +++ b/examples/src/main/java/com/demcha/examples/templates/cv/v2/CvMintEditorialExample.java @@ -0,0 +1,86 @@ +package com.demcha.examples.templates.cv.v2; + +import com.demcha.compose.GraphCompose; +import com.demcha.compose.document.api.DocumentPageSize; +import com.demcha.compose.document.api.DocumentSession; +import com.demcha.compose.document.templates.api.DocumentTemplate; +import com.demcha.compose.document.templates.cv.v2.data.CvDocument; +import com.demcha.compose.document.exceptions.DocumentRenderingException; +import com.demcha.compose.document.templates.cv.v2.presets.MintEditorial; +import com.demcha.examples.support.ExampleDataFactory; +import com.demcha.examples.support.ExampleOutputPaths; + +import java.io.IOException; +import java.nio.file.Path; + +/** + * Renders the v2 Mint Editorial CV preset against the rich "Rose Harris" + * showcase dataset ({@link ExampleDataFactory#mintEditorialShowcaseCv()}) + * so the output matches the Mint Editorial visual reference 1:1 — a + * two-page editorial resume with a full-width mint masthead rule, a + * contact / interests / education left sidebar beside profile + experience + * on page 1, and an expertise / skill-bars / social sidebar beside + * continued experience, awards and references on page 2. + * + *

The showcase dataset is example-local on purpose: the shared + * {@link ExampleDataFactory#sampleCvDocumentV2()} stays untouched so no + * other preset's visual baseline moves.

+ * + *

Output: + * {@code examples/target/generated-pdfs/templates/cv/cv-mint-editorial-v2.pdf} + * (falls back to {@code …-rev2.pdf} when the primary file is locked by an + * open viewer).

+ */ +public final class CvMintEditorialExample { + + private CvMintEditorialExample() { + } + + public static Path generate() throws Exception { + CvDocument doc = ExampleDataFactory.mintEditorialShowcaseCv(); + Path primary = ExampleOutputPaths.prepare( + "templates/cv", "cv-mint-editorial-v2.pdf"); + try { + return render(doc, primary); + } catch (DocumentRenderingException rendering) { + if (!causedByIo(rendering)) { + throw rendering; + } + // The user may still have the previous PDF open in a viewer, + // which holds a Windows file lock (surfaces as an IOException + // wrapped in DocumentRenderingException). Fall back to a -rev2 + // path so the render still succeeds and is reported. + Path fallback = ExampleOutputPaths.prepare( + "templates/cv", "cv-mint-editorial-v2-rev2.pdf"); + System.out.println("Primary output locked (" + rendering.getMessage() + + "); writing fallback: " + fallback); + return render(doc, fallback); + } + } + + private static boolean causedByIo(Throwable t) { + for (Throwable c = t; c != null; c = c.getCause()) { + if (c instanceof IOException) { + return true; + } + } + return false; + } + + private static Path render(CvDocument doc, Path outputFile) throws Exception { + DocumentTemplate template = MintEditorial.create(); + float m = (float) MintEditorial.RECOMMENDED_MARGIN; + try (DocumentSession document = GraphCompose.document(outputFile) + .pageSize(DocumentPageSize.A4) + .margin(m, m, m, m) + .create()) { + template.compose(document, doc); + document.buildPdf(); + } + return outputFile; + } + + public static void main(String[] args) throws Exception { + System.out.println("Generated: " + generate()); + } +} diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java new file mode 100644 index 00000000..bd404f49 --- /dev/null +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java @@ -0,0 +1,133 @@ +package com.demcha.compose.document.templates.coverletter.v2.presets; + +import com.demcha.compose.document.api.DocumentSession; +import com.demcha.compose.document.dsl.PageFlowBuilder; +import com.demcha.compose.document.dsl.SectionBuilder; +import com.demcha.compose.document.style.DocumentColor; +import com.demcha.compose.document.style.DocumentInsets; +import com.demcha.compose.document.style.DocumentTextDecoration; +import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.templates.api.DocumentTemplate; +import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; +import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; +import com.demcha.compose.document.templates.cv.v2.widgets.Headline; +import com.demcha.compose.document.templates.cv.v2.widgets.Subheadline; + +import java.util.Objects; + +/** + * v2 cover-letter pair for the {@code MintEditorial} CV preset. + * + *

Reproduces the CV's signature masthead 1:1 — a centred spaced-caps + * Poppins name, a centred soft-mint accent tagline, and a full-width 6pt + * mint accent rule — then a single-column letter body via the shared + * {@link LetterBody}. Palette / typography / spacing come from the + * same {@link CvTheme#mintEditorial()} the CV uses, and the + * mint accent is read from {@code theme.palette().banner()} exactly as in the + * CV, so the CV and the letter read as one matched set. The CV's two-column + * sidebar grids are a CV-body concern and are intentionally not part of the + * letter.

+ */ +public final class MintEditorialLetter { + + /** Stable template identifier. */ + public static final String ID = "mint-editorial-letter"; + + /** Human-readable display name. */ + public static final String DISPLAY_NAME = "Mint Editorial Letter"; + + /** Recommended symmetric page margin (in points). Matches the CV preset. */ + public static final double RECOMMENDED_MARGIN = 48.0; + + private MintEditorialLetter() { + } + + /** Builds the letter with its Mint Editorial theme. */ + public static DocumentTemplate create() { + return create(CvTheme.mintEditorial()); + } + + /** + * Builds the letter with a caller-supplied theme (share the paired CV's + * theme instance for a guaranteed visual match). + */ + public static DocumentTemplate create(CvTheme theme) { + Objects.requireNonNull(theme, "theme"); + return new Template(theme); + } + + private static final class Template implements DocumentTemplate { + + private final CvTheme theme; + private final DocumentColor accent; + + Template(CvTheme theme) { + this.theme = theme; + // Same accent source as the paired CV preset — the palette + // banner slot carries the mint accent. + this.accent = theme.palette().banner(); + } + + @Override + public String id() { + return ID; + } + + @Override + public String displayName() { + return DISPLAY_NAME; + } + + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + double innerWidth = document.canvas().innerWidth(); + double pageWidth = document.canvas().width(); + // Full-page-width masthead rule (see MintEditorial): bleed past + // the page margins so the mint rule spans the whole page. + double ruleBleed = (pageWidth - innerWidth) / 2.0; + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2MintEditorialRoot") + .spacing(theme.spacing().pageFlowSpacing()); + + flow.addSection("CoverLetterV2MintEditorialHeader", + section -> addMasthead(section, doc.identity())); + flow.addLine(line -> line + .name("CoverLetterV2MintEditorialHeaderRule") + .horizontal(pageWidth) + .color(accent) + .thickness(theme.spacing().accentRuleWidth()) + .margin(new DocumentInsets(8, -ruleBleed, 14, -ruleBleed))); + + flow.addSection("CoverLetterV2MintEditorialBody", host -> + LetterBody.render(host, doc, theme)); + + flow.build(); + } + + /** + * Centred spaced-caps name + mint accent tagline — the identical + * masthead the {@code MintEditorial} CV preset renders, so the + * matched set never forks the header treatment. + */ + private void addMasthead(SectionBuilder section, CvIdentity identity) { + Headline.spacedCentered(section, identity.name(), theme); + String jobTitle = identity.jobTitle(); + if (jobTitle != null && !jobTitle.isBlank()) { + Subheadline.centeredSpacedCaps(section, jobTitle, taglineStyle()); + } + } + + private DocumentTextStyle taglineStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.BOLD, accent); + } + } +} diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvSkill.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvSkill.java new file mode 100644 index 00000000..4e90c6d4 --- /dev/null +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvSkill.java @@ -0,0 +1,50 @@ +package com.demcha.compose.document.templates.cv.v2.data; + +import java.util.Objects; +import java.util.OptionalDouble; + +/** + * One atomic skill label with an optional proficiency level in + * {@code [0, 1]}. + * + *

The level is what data-driven skill visuals — proficiency bars, + * dots, meters — read. Skills created without a level (the common case, + * and every skill built through the string-based + * {@link SkillGroup#of(String, String...)} / + * {@link SkillGroup#ofNames(String, java.util.List)} APIs) carry an + * empty level, so name-only renderers are completely unaffected by the + * level channel.

+ * + * @param name non-blank skill label + * @param level optional proficiency in {@code [0, 1]}; empty when + * unspecified + */ +public record CvSkill(String name, OptionalDouble level) { + + public CvSkill { + Objects.requireNonNull(name, "name"); + Objects.requireNonNull(level, "level"); + name = name.trim(); + if (name.isBlank()) { + throw new IllegalArgumentException("name must not be blank"); + } + if (level.isPresent()) { + double value = level.getAsDouble(); + if (value < 0.0 || value > 1.0) { + throw new IllegalArgumentException( + "level must be in [0,1] but was " + value); + } + } + } + + /** Skill with no proficiency level. */ + public static CvSkill of(String name) { + return new CvSkill(name, OptionalDouble.empty()); + } + + /** Skill with a proficiency level, clamped to {@code [0, 1]}. */ + public static CvSkill of(String name, double level) { + return new CvSkill(name, + OptionalDouble.of(Math.max(0.0, Math.min(1.0, level)))); + } +} diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillGroup.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillGroup.java index 0003b7f4..b22a6441 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillGroup.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillGroup.java @@ -6,44 +6,82 @@ import java.util.Objects; /** - * One semantic skill category and its atomic skill labels. + * One semantic skill category and its atomic skill entries. * *

Examples: {@code Languages -> [Java 21, Kotlin, SQL]} or * {@code Testing -> [JUnit 5, AssertJ, visual regression]}. Presets * can render the same group as a table cell, a sidebar list, chips, - * or a compact inline row without reparsing free text.

+ * proficiency bars, or a compact inline row without reparsing free + * text.

+ * + *

Each entry is a {@link CvSkill} that optionally carries a + * proficiency level in {@code [0, 1]}. The level is read only by + * data-driven visuals (skill bars/meters); name-only renderers use + * {@link #skills()} and are unaffected by whether levels are present. + * Groups built through the string APIs ({@link #of(String, String...)}, + * {@link #ofNames(String, List)}) carry no levels.

* * @param category category label, non-blank - * @param skills ordered skill labels; blank values are ignored + * @param entries ordered skill entries; blank-named entries are ignored */ -public record SkillGroup(String category, List skills) { +public record SkillGroup(String category, List entries) { public SkillGroup { Objects.requireNonNull(category, "category"); - Objects.requireNonNull(skills, "skills"); + Objects.requireNonNull(entries, "entries"); category = category.trim(); if (category.isBlank()) { throw new IllegalArgumentException("category must not be blank"); } - List cleaned = new ArrayList<>(skills.size()); - for (String skill : skills) { - String value = skill == null ? "" : skill.trim(); - if (!value.isBlank()) { - cleaned.add(value); + List cleaned = new ArrayList<>(entries.size()); + for (CvSkill entry : entries) { + if (entry != null && !entry.name().isBlank()) { + cleaned.add(entry); } } - skills = List.copyOf(cleaned); + entries = List.copyOf(cleaned); } + /** Skill group from plain labels (no proficiency levels). */ public static SkillGroup of(String category, String... skills) { - return new SkillGroup(category, + return ofNames(category, skills == null ? List.of() : Arrays.asList(skills)); } + /** Skill group from a list of plain labels (no proficiency levels). */ + public static SkillGroup ofNames(String category, List skills) { + List out = new ArrayList<>(skills == null ? 0 : skills.size()); + if (skills != null) { + for (String skill : skills) { + String value = skill == null ? "" : skill.trim(); + if (!value.isBlank()) { + out.add(CvSkill.of(value)); + } + } + } + return new SkillGroup(category, out); + } + + /** + * Ordered skill labels with the proficiency levels dropped. + * + *

This is the shape every name-only renderer consumes; it is kept + * stable so adding levels never changes name-based output.

+ * + * @return ordered skill labels + */ + public List skills() { + List names = new ArrayList<>(entries.size()); + for (CvSkill entry : entries) { + names.add(entry.name()); + } + return List.copyOf(names); + } + /** - * @return comma-separated skills, useful for compact renderers + * @return comma-separated skill labels, useful for compact renderers */ public String skillsInline() { - return String.join(", ", skills); + return String.join(", ", skills()); } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillsSection.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillsSection.java index 83f71954..ed4cea06 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillsSection.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/data/SkillsSection.java @@ -65,7 +65,7 @@ public Builder group(SkillGroup group) { } public Builder group(String category, List skills) { - this.groups.add(new SkillGroup(category, skills)); + this.groups.add(SkillGroup.ofNames(category, skills)); return this; } @@ -74,6 +74,20 @@ public Builder group(String category, String... skills) { return this; } + /** + * Add a group whose entries carry optional proficiency levels. + * Use this for presets that render data-driven skill bars/meters; + * name-only presets render the same entries as plain labels. + * + * @param category group category label, non-blank + * @param entries ordered leveled skill entries + * @return this builder + */ + public Builder leveledGroup(String category, List entries) { + this.groups.add(new SkillGroup(category, entries)); + return this; + } + public SkillsSection build() { return new SkillsSection(title, groups); } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorial.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorial.java new file mode 100644 index 00000000..4f455289 --- /dev/null +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorial.java @@ -0,0 +1,934 @@ +package com.demcha.compose.document.templates.cv.v2.presets; + +import com.demcha.compose.document.api.DocumentSession; +import com.demcha.compose.document.dsl.ParagraphBuilder; +import com.demcha.compose.document.dsl.SectionBuilder; +import com.demcha.compose.document.image.DocumentImageData; +import com.demcha.compose.document.node.DocumentLinkOptions; +import com.demcha.compose.document.node.ParagraphNode; +import com.demcha.compose.document.node.TextAlign; +import com.demcha.compose.document.style.DocumentColor; +import com.demcha.compose.document.style.DocumentInsets; +import com.demcha.compose.document.style.DocumentStroke; +import com.demcha.compose.document.style.DocumentTextDecoration; +import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.table.DocumentTableCell; +import com.demcha.compose.document.table.DocumentTableColumn; +import com.demcha.compose.document.table.DocumentTableStyle; +import com.demcha.compose.document.templates.api.DocumentTemplate; +import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; +import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; +import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; +import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.cv.v2.data.CvDocument; +import com.demcha.compose.document.templates.cv.v2.data.CvEntry; +import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.v2.data.CvLink; +import com.demcha.compose.document.templates.cv.v2.data.CvRow; +import com.demcha.compose.document.templates.cv.v2.data.CvSection; +import com.demcha.compose.document.templates.cv.v2.data.CvSkill; +import com.demcha.compose.document.templates.cv.v2.data.EntriesSection; +import com.demcha.compose.document.templates.cv.v2.data.ParagraphSection; +import com.demcha.compose.document.templates.cv.v2.data.RowsSection; +import com.demcha.compose.document.templates.cv.v2.data.SkillGroup; +import com.demcha.compose.document.templates.cv.v2.data.SkillsSection; +import com.demcha.compose.document.templates.cv.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; +import com.demcha.compose.document.templates.cv.v2.widgets.Headline; +import com.demcha.compose.document.templates.cv.v2.widgets.IconTextRow; +import com.demcha.compose.document.templates.cv.v2.widgets.SkillBar; +import com.demcha.compose.document.templates.cv.v2.widgets.Subheadline; + +import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; + +/** + * v2 "Mint Editorial" CV preset — a two-page, two-column editorial resume + * ported from the flat canonical {@code MintEditorialCvTemplate}. + * + *

Visual signature: a centred spaced-caps name with a soft mint accent + * tagline, a full-width 6pt mint accent rule, then two pages that each lay + * out a narrow left sidebar (weight {@value #SIDEBAR_WEIGHT}) beside a wide + * main column. Page 1 sidebar carries Contact (icon rows), Interests and + * Education; page 1 main carries Profile and the first slice of Experience. + * Page 2 sidebar carries Expertise (badge + label list), level-driven Skill + * bars and Social rows; page 2 main carries the rest of Experience plus + * Awards and References two-column grids. Poppins throughout; the mint + * accent lives in {@code theme.palette().banner()}.

+ * + *

Atomic-row partitioning

+ * + *

Each page's sidebar+main grid is a single {@code addRow}, which the + * canonical paginator treats as atomic — the whole row must + * fit on one page or it raises {@code AtomicNodeTooLargeException} (rows do + * not page-break, and a row cannot host a table directly, so the Awards / + * References tables live inside the main section column, not the row). + * To keep each page's row inside the page bound the preset slices Experience + * across the two pages ({@value #EXPERIENCE_PAGE_ONE} entries on page 1, the + * remainder on page 2), mirroring the blueprint's + * {@code experiencePage1 / experiencePage2} split.

+ * + *

The two rows reach two pages by natural atomic overflow, + * not an explicit page break: the page-1 row fills page 1, so the page-2 row — + * being atomic — moves whole onto page 2. An explicit {@code addPageBreak} is + * deliberately avoided because a break landing on an already-full page-1 + * emits a blank intermediate page.

+ * + *

Section mapping & graceful degradation

+ * + *

Sections are resolved from {@link Slot#MAIN} by title keyword via + * {@link SectionLookup}; the canonical sample places everything in MAIN. + * Mappings:

+ * + *
    + *
  • Contact ← {@link CvIdentity#contact()} (phone / email / + * address) + {@link CvIdentity#links()} as icon rows.
    • + *
  • Interests ← a {@link RowsSection} titled "interests" (absent + * in the canonical sample → skipped).
    • + *
  • Education ← the Education {@link EntriesSection}.
    • + *
  • Expertise ← the {@link SkillsSection} group categories (the + * category labels read as an expertise list), beneath the badge image.
    • + *
  • Skills ← the {@link SkillsSection} entries flattened into + * {@link SkillBar}s; entries with a level draw a bar, name-only entries + * render as a label.
    • + *
  • Social ← {@link CvIdentity#links()} as icon rows.
    • + *
  • Profile ← the summary / profile {@link ParagraphSection}.
    • + *
  • Experience ← the Experience {@link EntriesSection}, split + * across the two pages.
    • + *
  • Awards ← a {@link RowsSection} titled "awards" (name = row + * label, meta = row body); absent → skipped.
    • + *
  • References ← a {@link RowsSection} titled "references"; absent + * → skipped.
    • + *
+ * + *

Absent sidebar/main sections are skipped rather than crashing, so the + * preset renders cleanly against documents that omit Interests, Awards, + * References, or Social.

+ * + *

Page chrome

+ * + *

Unlike the sidebar presets, Mint draws no {@code pageBackgrounds}: the + * page is white and the two-column structure comes purely from the per-page + * weighted {@code addRow}. The reusable drawing — icon rows, skill bars — is + * delegated to {@link IconTextRow} and {@link SkillBar}; the preset only + * orchestrates page composition, section mapping, and the Awards / References + * grids (which are page-composition concerns local to this layout).

+ */ +public final class MintEditorial { + + /** Stable template identifier. */ + public static final String ID = "mint-editorial"; + + /** Human-readable display name. */ + public static final String DISPLAY_NAME = "Mint Editorial"; + + /** Recommended symmetric page margin (in points). */ + public static final double RECOMMENDED_MARGIN = 48.0; + + /** Sidebar column weight; main column gets {@code 1 - SIDEBAR_WEIGHT}. */ + private static final double SIDEBAR_WEIGHT = 0.31; + + /** Main column weight. */ + private static final double MAIN_WEIGHT = 1.0 - SIDEBAR_WEIGHT; + + /** Horizontal gap (points) between the sidebar and main columns. */ + private static final double COLUMN_GAP = 40.0; + + /** + * Vertical gap (points) between consecutive blocks within a column. + * Each block is wrapped in its own sub-section so this gap applies + * between blocks only — never between the leaf paragraphs / + * lines inside a block (whose rhythm is margin-driven). Flattening all + * leaves into one section would multiply this gap across every child + * and overflow the atomic page row. + */ + private static final double BLOCK_GAP = 22.0; + + /** Visual gap (points) between the two grid columns in Awards / References. */ + private static final double GRID_COLUMN_GAP = 24.0; + + /** Experience entries rendered on page 1; the rest go to page 2. */ + private static final int EXPERIENCE_PAGE_ONE = 2; + + /** Expertise category labels shown beneath the badge. */ + private static final int EXPERTISE_LIMIT = 6; + + /** Skill bars rendered in the page-2 sidebar. */ + private static final int SKILL_LIMIT = 6; + + /** Inline contact / social icon edge length (points). */ + private static final double CONTACT_ICON_SIZE = 9.0; + + /** Social icon edge length (points) — the filled badges read larger. */ + private static final double SOCIAL_ICON_SIZE = 12.0; + + /** Expertise badge edge length (points). */ + private static final double BADGE_SIZE = 36.0; + + private static final String ICON_ROOT = "/templates/cv/mint-editorial/icons/"; + private static final Map ICON_CACHE = new ConcurrentHashMap<>(); + + private static final List INTERESTS_KEYS = + List.of("interests", "interest"); + private static final List EDUCATION_KEYS = + List.of("education", "certifications"); + private static final List SKILL_KEYS = + List.of("skills", "technical skills", "expertise"); + private static final List SUMMARY_KEYS = + List.of("profile", "professional profile", "summary", + "professional summary"); + private static final List EXPERIENCE_KEYS = + List.of("experience", "employment", "professional experience", + "work"); + private static final List AWARDS_KEYS = + List.of("awards", "award", "honours", "honors"); + private static final List REFERENCES_KEYS = + List.of("references", "reference", "referees"); + + private MintEditorial() { + } + + /** Builds the preset with its Mint Editorial theme. */ + public static DocumentTemplate create() { + return create(CvTheme.mintEditorial()); + } + + /** + * Builds the preset with a caller-supplied theme (share the paired + * cover letter's theme instance for a guaranteed visual match). + */ + public static DocumentTemplate create(CvTheme theme) { + Objects.requireNonNull(theme, "theme"); + return new Template(theme); + } + + private static final class Template implements DocumentTemplate { + + private final CvTheme theme; + private final DocumentColor accent; + + Template(CvTheme theme) { + this.theme = theme; + // Mint carries its accent in the palette banner slot — single + // source shared with the paired cover letter. + this.accent = theme.palette().banner(); + } + + @Override + public String id() { + return ID; + } + + @Override + public String displayName() { + return DISPLAY_NAME; + } + + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + double innerWidth = document.canvas().innerWidth(); + double pageWidth = document.canvas().width(); + // Bleed the masthead accent rule edge-to-edge: draw it at full + // page width with negative side margins that cancel the page + // margins, so the mint rule spans the whole page (matching the + // reference) instead of only the content column. + double ruleBleed = (pageWidth - innerWidth) / 2.0; + // Gap is subtracted before the weighted split (see + // NodeDefinitionSupport row measurement), so derive the column + // inner widths the same way for the skill-bar track and grids. + double usable = Math.max(0.0, innerWidth - COLUMN_GAP); + double sidebarInner = usable * SIDEBAR_WEIGHT; + double mainInner = usable * MAIN_WEIGHT; + double gridColumnWidth = mainInner / 2.0; + + List sections = doc.sectionsIn(Slot.MAIN); + CvIdentity identity = doc.identity(); + + CvSection interests = SectionLookup.firstMatching(sections, INTERESTS_KEYS); + CvSection education = SectionLookup.firstMatching(sections, EDUCATION_KEYS); + CvSection skills = SectionLookup.firstMatching(sections, SKILL_KEYS); + CvSection profile = SectionLookup.firstMatching(sections, SUMMARY_KEYS); + CvSection experience = SectionLookup.firstMatching(sections, EXPERIENCE_KEYS); + CvSection awards = SectionLookup.firstMatching(sections, AWARDS_KEYS); + CvSection references = SectionLookup.firstMatching(sections, REFERENCES_KEYS); + + List experienceEntries = entriesOf(experience); + List experiencePage1 = experienceEntries.stream() + .limit(EXPERIENCE_PAGE_ONE).toList(); + List experiencePage2 = experienceEntries.stream() + .skip(EXPERIENCE_PAGE_ONE).toList(); + + document.dsl() + .pageFlow() + .name("CvV2MintEditorialRoot") + .spacing(theme.spacing().pageFlowSpacing()) + .addSection("CvV2MintEditorialHeader", + section -> addHeader(section, identity)) + .addLine(line -> line + .name("CvV2MintEditorialHeaderRule") + .horizontal(pageWidth) + .color(accent) + .thickness(theme.spacing().accentRuleWidth()) + .margin(new DocumentInsets(8, -ruleBleed, 14, -ruleBleed))) + .addRow("CvV2MintEditorialPageOne", row -> { + row.spacing(COLUMN_GAP).weights(SIDEBAR_WEIGHT, MAIN_WEIGHT); + row.addSection("CvV2MintEditorialPageOneSidebar", sidebar -> { + sidebar.spacing(BLOCK_GAP).padding(DocumentInsets.zero()); + addContact(sidebar, identity); + addInterests(sidebar, interests); + addEducation(sidebar, education); + }); + row.addSection("CvV2MintEditorialPageOneMain", main -> { + main.spacing(BLOCK_GAP).padding(DocumentInsets.zero()); + addProfile(main, profile); + addExperience(main, "Experience", experiencePage1); + }); + }) + .addRow("CvV2MintEditorialPageTwo", row -> { + row.spacing(COLUMN_GAP).weights(SIDEBAR_WEIGHT, MAIN_WEIGHT); + row.addSection("CvV2MintEditorialPageTwoSidebar", sidebar -> { + sidebar.spacing(BLOCK_GAP).padding(DocumentInsets.zero()); + addExpertise(sidebar, skills); + addSkills(sidebar, skills, sidebarInner); + addSocial(sidebar, identity); + }); + row.addSection("CvV2MintEditorialPageTwoMain", main -> { + main.spacing(BLOCK_GAP).padding(DocumentInsets.zero()); + addExperience(main, "Experience", experiencePage2); + addAwards(main, awards, gridColumnWidth); + addReferences(main, references, gridColumnWidth); + }); + }) + .build(); + } + + // -- Header -------------------------------------------------------- + + private void addHeader(SectionBuilder section, CvIdentity identity) { + // Headline.spacedCentered sets the section's spacing + padding; + // it renders the centred spaced-caps name as the page's loudest + // element. The tagline follows in the mint accent. + Headline.spacedCentered(section, identity.name(), theme); + String jobTitle = identity.jobTitle(); + if (jobTitle != null && !jobTitle.isBlank()) { + Subheadline.centeredSpacedCaps(section, jobTitle, taglineStyle()); + } + } + + // -- Sidebar: Contact --------------------------------------------- + + private void addContact(SectionBuilder section, CvIdentity identity) { + section.addSection("CvV2MintEditorialContact", block -> { + block.spacing(0).padding(DocumentInsets.zero()); + addBlockHeading(block, "Contact"); + DocumentTextStyle style = contactStyle(); + String phone = identity.contact().phone(); + if (!phone.isBlank()) { + IconTextRow.render(block, icon("phone.png"), CONTACT_ICON_SIZE, + phone, style, null, DocumentInsets.bottom(13)); + } + String email = identity.contact().email(); + if (!email.isBlank()) { + IconTextRow.render(block, icon("email.png"), CONTACT_ICON_SIZE, + email, style, new DocumentLinkOptions("mailto:" + email), + DocumentInsets.bottom(13)); + } + String address = identity.contact().address(); + if (!address.isBlank()) { + IconTextRow.render(block, icon("location.png"), CONTACT_ICON_SIZE, + address, style, null, DocumentInsets.bottom(13)); + } + for (CvLink link : identity.links()) { + if (link.label().isBlank()) { + continue; + } + DocumentLinkOptions options = link.url().isBlank() + ? null + : new DocumentLinkOptions(link.url().trim()); + IconTextRow.render(block, icon(contactIconFile(link.label())), + CONTACT_ICON_SIZE, link.label(), style, options, + DocumentInsets.bottom(13)); + } + }); + } + + // -- Sidebar: Interests ------------------------------------------- + + private void addInterests(SectionBuilder section, CvSection interests) { + if (!(interests instanceof RowsSection rows) || rows.rows().isEmpty()) { + return; + } + section.addSection("CvV2MintEditorialInterests", block -> { + block.spacing(0).padding(DocumentInsets.zero()); + addBlockHeading(block, interests.title()); + for (CvRow row : rows.rows()) { + addLabel(block, MarkdownInline.plainText(row.label())); + } + }); + } + + // -- Sidebar: Education ------------------------------------------- + + private void addEducation(SectionBuilder section, CvSection education) { + List entries = entriesOf(education); + if (entries.isEmpty()) { + return; + } + section.addSection("CvV2MintEditorialEducation", block -> { + block.spacing(0).padding(DocumentInsets.zero()); + addBlockHeading(block, education.title()); + DocumentTextStyle degreeStyle = labelStyle(); + DocumentTextStyle metaStyle = smallStyle(); + for (CvEntry entry : entries) { + block.addParagraph(p -> p + .text(TextOrnaments.spacedUpper( + MarkdownInline.plainText(entry.title()))) + .textStyle(degreeStyle) + .align(TextAlign.LEFT) + .margin(DocumentInsets.bottom(5))); + if (!entry.subtitle().isBlank()) { + block.addParagraph(p -> p + .text(MarkdownInline.plainText(entry.subtitle())) + .textStyle(metaStyle) + .align(TextAlign.LEFT) + .margin(DocumentInsets.bottom(5))); + } + if (!entry.date().isBlank()) { + block.addParagraph(p -> p + .text(MarkdownInline.plainText(entry.date())) + .textStyle(metaStyle) + .align(TextAlign.LEFT) + .margin(DocumentInsets.bottom(20))); + } + } + }); + } + + // -- Sidebar: Expertise ------------------------------------------- + + private void addExpertise(SectionBuilder section, CvSection skills) { + if (!(skills instanceof SkillsSection skillsSection)) { + return; + } + List categories = new ArrayList<>(); + for (SkillGroup group : skillsSection.groups()) { + if (!group.category().isBlank()) { + categories.add(group.category()); + } + } + if (categories.isEmpty()) { + return; + } + section.addSection("CvV2MintEditorialExpertise", block -> { + block.spacing(0).padding(DocumentInsets.zero()); + addBlockHeading(block, "Expertise"); + block.addImage(image -> image + .name("CvV2MintEditorialExpertiseBadge") + .source(icon("expertise-badge.png")) + .size(BADGE_SIZE, BADGE_SIZE) + .margin(DocumentInsets.bottom(18))); + for (String category : categories.stream().limit(EXPERTISE_LIMIT).toList()) { + addLabel(block, category); + } + }); + } + + // -- Sidebar: Skills (bars) --------------------------------------- + + private void addSkills(SectionBuilder section, CvSection skills, + double trackWidth) { + if (!(skills instanceof SkillsSection skillsSection)) { + return; + } + List flattened = new ArrayList<>(); + for (SkillGroup group : skillsSection.groups()) { + flattened.addAll(group.entries()); + } + if (flattened.isEmpty()) { + return; + } + section.addSection("CvV2MintEditorialSkills", block -> { + block.spacing(0).padding(DocumentInsets.zero()); + addBlockHeading(block, "Skills"); + for (CvSkill skill : flattened.stream().limit(SKILL_LIMIT).toList()) { + SkillBar.render(block, skill, trackWidth, theme); + } + }); + } + + // -- Sidebar: Social ---------------------------------------------- + + private void addSocial(SectionBuilder section, CvIdentity identity) { + if (identity.links().isEmpty()) { + return; + } + section.addSection("CvV2MintEditorialSocial", block -> { + block.spacing(0).padding(DocumentInsets.zero()); + addBlockHeading(block, "Social"); + DocumentTextStyle style = labelStyle(); + for (CvLink link : identity.links()) { + if (link.label().isBlank()) { + continue; + } + DocumentLinkOptions options = link.url().isBlank() + ? null + : new DocumentLinkOptions(link.url().trim()); + IconTextRow.render(block, icon(socialIconFile(link.label())), + SOCIAL_ICON_SIZE, link.label(), style, options, + DocumentInsets.bottom(11)); + } + }); + } + + // -- Main: Profile ------------------------------------------------- + + private void addProfile(SectionBuilder section, CvSection profile) { + if (!(profile instanceof ParagraphSection paragraph) + || paragraph.body().isBlank()) { + return; + } + section.addSection("CvV2MintEditorialProfile", block -> { + block.spacing(0).padding(DocumentInsets.zero()); + addBlockHeading(block, "Profile"); + DocumentTextStyle bodyStyle = bodyStyle(); + block.addParagraph(p -> p + .textStyle(bodyStyle) + .lineSpacing(theme.typography().bodyLineSpacing()) + .align(TextAlign.LEFT) + .margin(DocumentInsets.bottom(12)) + .rich(rich -> MarkdownInline.appendTrimmed(rich, + paragraph.body(), bodyStyle))); + }); + } + + // -- Main: Experience --------------------------------------------- + + private void addExperience(SectionBuilder section, String title, + List entries) { + if (entries.isEmpty()) { + return; + } + section.addSection("CvV2MintEditorialExperience", block -> { + block.spacing(0).padding(DocumentInsets.zero()); + addBlockHeading(block, title); + DocumentTextStyle titleStyle = labelStyle(); + DocumentTextStyle metaStyle = smallStyle(); + DocumentTextStyle bodyStyle = bodyStyle(); + for (CvEntry entry : entries) { + block.addParagraph(p -> p + .text(TextOrnaments.spacedUpper( + MarkdownInline.plainText(entry.title()))) + .textStyle(titleStyle) + .align(TextAlign.LEFT) + .margin(DocumentInsets.bottom(5))); + String meta = composeMeta(entry); + if (!meta.isBlank()) { + block.addParagraph(p -> p + .text(meta) + .textStyle(metaStyle) + .align(TextAlign.LEFT) + .margin(DocumentInsets.bottom(8))); + } + // The body may carry trailing markdown bullet lines + // ("- highlight"). Render the prose part as a paragraph + // and the bullet lines as a real bullet list. Bodies + // without bullet lines (the canonical sample) take the + // plain-paragraph path unchanged. + BodyParts parts = splitBody(entry.body()); + boolean hasBullets = !parts.bullets().isEmpty(); + if (!parts.prose().isBlank()) { + block.addParagraph(p -> p + .textStyle(bodyStyle) + .lineSpacing(theme.typography().bodyLineSpacing()) + .align(TextAlign.LEFT) + .margin(DocumentInsets.bottom(hasBullets ? 6 : 18)) + .rich(rich -> MarkdownInline.appendTrimmed(rich, + parts.prose(), bodyStyle))); + } + if (hasBullets) { + block.addList(list -> list + .bullet() + .items(parts.bullets()) + .textStyle(smallStyle()) + .lineSpacing(theme.typography().bodyLineSpacing()) + .margin(new DocumentInsets(0, 0, 18, 12))); + } + } + }); + } + + // -- Main: Awards (2-col grid) ------------------------------------ + + private void addAwards(SectionBuilder section, CvSection awards, + double gridColumnWidth) { + if (!(awards instanceof RowsSection rows) || rows.rows().isEmpty()) { + return; + } + List entries = rows.rows(); + DocumentTableStyle nameLeft = cellStyle(labelStyle(), 4, GRID_COLUMN_GAP); + DocumentTableStyle nameRight = cellStyle(labelStyle(), 4, 0); + DocumentTableStyle metaLeft = cellStyle(smallStyle(), 18, GRID_COLUMN_GAP); + DocumentTableStyle metaRight = cellStyle(smallStyle(), 18, 0); + DocumentTableStyle metaLeftLast = cellStyle(smallStyle(), 0, GRID_COLUMN_GAP); + DocumentTableStyle metaRightLast = cellStyle(smallStyle(), 0, 0); + + section.addSection("CvV2MintEditorialAwards", block -> { + block.spacing(0).padding(DocumentInsets.zero()); + addBlockHeading(block, awards.title()); + block.addTable(table -> { + table.name("CvV2MintEditorialAwardsGrid") + .columns(DocumentTableColumn.fixed(gridColumnWidth), + DocumentTableColumn.fixed(gridColumnWidth)) + .padding(DocumentInsets.zero()) + .margin(DocumentInsets.zero()); + int pairs = (entries.size() + 1) / 2; + for (int pairIndex = 0; pairIndex < pairs; pairIndex++) { + CvRow left = entries.get(pairIndex * 2); + CvRow right = pairIndex * 2 + 1 < entries.size() + ? entries.get(pairIndex * 2 + 1) + : null; + boolean lastPair = pairIndex == pairs - 1; + table.rowCells( + gridCell(TextOrnaments.spacedUpper( + MarkdownInline.plainText(left.label())), nameLeft), + gridCell(right == null ? "" : TextOrnaments.spacedUpper( + MarkdownInline.plainText(right.label())), nameRight)); + table.rowCells( + gridCell(MarkdownInline.plainText(left.body()), + lastPair ? metaLeftLast : metaLeft), + gridCell(right == null ? "" : MarkdownInline.plainText(right.body()), + lastPair ? metaRightLast : metaRight)); + } + }); + }); + } + + // -- Main: References (2-col grid) -------------------------------- + + private void addReferences(SectionBuilder section, CvSection references, + double gridColumnWidth) { + if (!(references instanceof RowsSection rows) || rows.rows().isEmpty()) { + return; + } + List entries = rows.rows(); + DocumentTableStyle nameLeft = cellStyle(labelStyle(), 4, GRID_COLUMN_GAP); + DocumentTableStyle nameRight = cellStyle(labelStyle(), 4, 0); + DocumentTableStyle subLeft = cellStyle(smallStyle(), 3, GRID_COLUMN_GAP); + DocumentTableStyle subRight = cellStyle(smallStyle(), 3, 0); + DocumentTableStyle lastLeft = cellStyle(smallStyle(), 18, GRID_COLUMN_GAP); + DocumentTableStyle lastRight = cellStyle(smallStyle(), 18, 0); + DocumentTableStyle lastLeftEnd = cellStyle(smallStyle(), 0, GRID_COLUMN_GAP); + DocumentTableStyle lastRightEnd = cellStyle(smallStyle(), 0, 0); + + section.addSection("CvV2MintEditorialReferences", block -> { + block.spacing(0).padding(DocumentInsets.zero()); + addBlockHeading(block, references.title()); + block.addTable(table -> { + table.name("CvV2MintEditorialReferencesGrid") + .columns(DocumentTableColumn.fixed(gridColumnWidth), + DocumentTableColumn.fixed(gridColumnWidth)) + .padding(DocumentInsets.zero()) + .margin(DocumentInsets.zero()); + int pairs = (entries.size() + 1) / 2; + for (int pairIndex = 0; pairIndex < pairs; pairIndex++) { + CvRow left = entries.get(pairIndex * 2); + CvRow right = pairIndex * 2 + 1 < entries.size() + ? entries.get(pairIndex * 2 + 1) + : null; + boolean lastPair = pairIndex == pairs - 1; + // Name row (spaced-caps bold). + table.rowCells( + gridCell(TextOrnaments.spacedUpper( + MarkdownInline.plainText(left.label())), nameLeft), + gridCell(right == null ? "" : TextOrnaments.spacedUpper( + MarkdownInline.plainText(right.label())), nameRight)); + // One table row per body line (Company / "P: phone" / + // email). The email line becomes a clickable mailto via + // a composed ParagraphNode cell — the working + // composed-cell shape on the PDF backend (paragraph + // cells render; section cells do not). + List leftLines = bodyLines(left); + List rightLines = right == null + ? List.of() : bodyLines(right); + int lineRows = Math.max(leftLines.size(), rightLines.size()); + for (int i = 0; i < lineRows; i++) { + boolean lastLine = i == lineRows - 1; + DocumentTableStyle leftStyle = lastLine + ? (lastPair ? lastLeftEnd : lastLeft) : subLeft; + DocumentTableStyle rightStyle = lastLine + ? (lastPair ? lastRightEnd : lastRight) : subRight; + table.rowCells( + referenceLineCell( + i < leftLines.size() ? leftLines.get(i) : "", + leftStyle), + referenceLineCell( + i < rightLines.size() ? rightLines.get(i) : "", + rightStyle)); + } + } + }); + }); + } + + private List bodyLines(CvRow row) { + List out = new ArrayList<>(); + for (String raw : row.body().split("\\R")) { + String line = MarkdownInline.plainText(raw).strip(); + if (!line.isBlank()) { + out.add(line); + } + } + return out; + } + + /** + * Builds a single reference detail cell. A line that contains an + * email becomes a clickable {@code mailto:} link via a composed + * {@link com.demcha.compose.document.node.ParagraphNode} cell (the + * working composed-cell shape on the PDF backend); every other line + * is a plain text cell. + */ + private DocumentTableCell referenceLineCell(String line, + DocumentTableStyle cellStyle) { + if (line == null || line.isBlank()) { + return gridCell("", cellStyle); + } + String email = extractEmail(line); + if (email == null) { + return gridCell(line, cellStyle); + } + DocumentLinkOptions link = new DocumentLinkOptions("mailto:" + email); + DocumentTextStyle linkStyle = CvTextStyles.of( + theme.typography().bodyFont(), + theme.typography().sizeEntryDate(), + DocumentTextDecoration.UNDERLINE, theme.palette().muted()); + ParagraphNode linked = new ParagraphBuilder() + .name("CvV2MintEditorialReferenceEmail") + .align(TextAlign.LEFT) + .inlineText(line, linkStyle, link) + .build(); + return DocumentTableCell.node(linked).withStyle(cellStyle); + } + + // -- Shared block heading (spaced-caps accent title) -------------- + + private void addBlockHeading(SectionBuilder block, String title) { + if (title == null || title.isBlank()) { + return; + } + block.addParagraph(p -> p + .text(TextOrnaments.spacedUpper(title)) + .textStyle(headingStyle()) + .align(TextAlign.LEFT) + .margin(DocumentInsets.bottom(18))); + } + + private void addLabel(SectionBuilder section, String text) { + if (text == null || text.isBlank()) { + return; + } + section.addParagraph(p -> p + .text(TextOrnaments.spacedUpper(text)) + .textStyle(labelStyle()) + .align(TextAlign.LEFT) + .margin(DocumentInsets.bottom(14))); + } + + private DocumentTableCell gridCell(String text, DocumentTableStyle style) { + return DocumentTableCell.text(text == null ? "" : text).withStyle(style); + } + + // -- Style factories ---------------------------------------------- + + private DocumentTextStyle taglineStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.BOLD, accent); + } + + private DocumentTextStyle headingStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeBanner(), + DocumentTextDecoration.BOLD, accent); + } + + private DocumentTextStyle labelStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeEntryTitle(), + DocumentTextDecoration.BOLD, theme.palette().ink()); + } + + private DocumentTextStyle bodyStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeBody(), + DocumentTextDecoration.DEFAULT, theme.palette().ink()); + } + + private DocumentTextStyle contactStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, theme.palette().muted()); + } + + private DocumentTextStyle smallStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeEntryDate(), + DocumentTextDecoration.DEFAULT, theme.palette().muted()); + } + + /** + * No-border, no-fill table cell style — a zero-width white stroke + * and a white fill suppress the engine's default 1pt black cell + * border. {@code rightPadding} drives the inter-column gap on the + * left column only (keep the right column at zero). + */ + private DocumentTableStyle cellStyle(DocumentTextStyle textStyle, + double bottomPadding, + double rightPadding) { + return DocumentTableStyle.builder() + .textStyle(textStyle) + .padding(new DocumentInsets(0, rightPadding, bottomPadding, 0)) + .stroke(DocumentStroke.of(DocumentColor.WHITE, 0)) + .fillColor(DocumentColor.WHITE) + .build(); + } + + private DocumentImageData icon(String fileName) { + return DocumentImageData.fromBytes( + ICON_CACHE.computeIfAbsent(ICON_ROOT + fileName, + MintEditorial::readIconBytes)); + } + } + + // -- Static helpers ---------------------------------------------------- + + private static String composeMeta(CvEntry entry) { + String subtitle = MarkdownInline.plainText(entry.subtitle()); + String date = MarkdownInline.plainText(entry.date()); + if (subtitle.isBlank()) { + return date; + } + if (date.isBlank()) { + return subtitle; + } + return subtitle + " | " + date; + } + + private static List entriesOf(CvSection section) { + if (section instanceof EntriesSection entries) { + return entries.entries(); + } + return List.of(); + } + + /** + * Splits an experience body into a leading prose block and trailing + * markdown bullet lines (lines beginning with {@code "- "} or + * {@code "* "}). Bodies with no bullet lines yield the whole text as + * prose and an empty bullet list, so the canonical sample renders + * exactly as before. + */ + private static BodyParts splitBody(String body) { + if (body == null || body.isBlank()) { + return new BodyParts("", List.of()); + } + List prose = new ArrayList<>(); + List bullets = new ArrayList<>(); + for (String rawLine : body.split("\\R")) { + String line = rawLine.strip(); + if (line.startsWith("- ") || line.startsWith("* ")) { + String item = line.substring(2).strip(); + if (!item.isBlank()) { + bullets.add(item); + } + } else if (!line.isBlank()) { + prose.add(line); + } + } + return new BodyParts(String.join(" ", prose), List.copyOf(bullets)); + } + + /** Prose + bullet split of an experience entry body. */ + private record BodyParts(String prose, List bullets) { + } + + /** + * Returns the bare email address contained in {@code line} (e.g. the + * {@code "hello@email.com"} inside {@code "E: hello@email.com"}), or + * {@code null} when the line carries no email-shaped token. + */ + private static String extractEmail(String line) { + if (line == null) { + return null; + } + for (String token : line.split("\\s+")) { + int at = token.indexOf('@'); + if (at > 0 && token.indexOf('.', at) > at + 1) { + return token; + } + } + return null; + } + + /** Maps a contact link label to its small inline glyph file. */ + private static String contactIconFile(String label) { + String normalized = SectionLookup.normalize(label); + if (normalized.contains("linkedin")) { + return "linkedin.png"; + } + if (normalized.contains("twitter")) { + return "twitter.png"; + } + if (normalized.contains("facebook")) { + return "facebook.png"; + } + if (normalized.contains("pinterest")) { + return "pinterest.png"; + } + // GitHub, portfolio, personal site, etc. → the globe glyph. + return "website.png"; + } + + /** Maps a social link label to its filled-badge glyph file. */ + private static String socialIconFile(String label) { + String normalized = SectionLookup.normalize(label); + if (normalized.contains("twitter")) { + return "twitter.png"; + } + if (normalized.contains("facebook")) { + return "facebook.png"; + } + if (normalized.contains("pinterest")) { + return "pinterest.png"; + } + if (normalized.contains("linkedin")) { + return "linkedin.png"; + } + // GitHub, portfolio, personal site, etc. → the globe glyph. + return "website.png"; + } + + private static byte[] readIconBytes(String resourcePath) { + try (InputStream input = MintEditorial.class + .getResourceAsStream(resourcePath)) { + if (input == null) { + throw new IllegalStateException( + "Missing mint editorial icon: " + resourcePath); + } + return input.readAllBytes(); + } catch (IOException e) { + throw new UncheckedIOException( + "Failed to read mint editorial icon: " + resourcePath, e); + } + } +} diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvPalette.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvPalette.java index 56bd2f0c..743155d3 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvPalette.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvPalette.java @@ -243,4 +243,22 @@ public static CvPalette executive() { DocumentColor.rgb(193, 201, 211), // rule — V1 MUTED_RULE DocumentColor.rgb(220, 226, 230)); // banner — unused, inherits classic } + + /** + * Mint Editorial palette: near-black ink, mid-grey metadata, + * dark-grey skill-bar rules, and a soft mint accent. The + * {@code banner} slot carries the mint accent (rgb(139,207,190)) — + * Mint draws no banner panels, so it reuses the slot for the accent + * the way the sidebar presets reuse it for the sidebar fill. Both + * the CV preset and its paired cover letter read + * {@code palette.banner()} as the single accent source, so the + * matched set never forks the colour. + */ + public static CvPalette mintEditorial() { + return new CvPalette( + DocumentColor.rgb(24, 24, 24), // ink (black) + DocumentColor.rgb(82, 82, 82), // muted + DocumentColor.rgb(70, 70, 70), // rule (skill-bar track) + DocumentColor.rgb(139, 207, 190)); // banner — reused as mint accent + } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvSpacing.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvSpacing.java index 03ab942c..f9c38c3a 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvSpacing.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvSpacing.java @@ -424,4 +424,30 @@ public static CvSpacing executive() { 0.45, // entryDateWeight 3.0); // entrySeparation } + + /** + * Spacing for the Mint Editorial preset: a measured editorial flow + * with a thick (6pt) full-width mint accent rule under the centered + * masthead, generous separation between experience entries, and + * tight section bodies. The two-column sidebar/main split and its + * column gap are page-composition concerns owned by the preset, not + * spacing tokens. + */ + public static CvSpacing mintEditorial() { + return new CvSpacing( + 18, // pageFlowSpacing (header / rule / grid rhythm) + 5, // sectionBodySpacing + DocumentInsets.zero(), // sectionBodyPadding + DocumentInsets.zero(), // headlinePadding (header section owns its spacing) + DocumentInsets.zero(), // contactPadding + 0.0, // bannerCornerRadius (unused — no banners) + 0.0, // bannerInnerPadding (unused) + DocumentInsets.zero(), // bannerMargin (unused) + 6.0, // accentRuleWidth (thick mint masthead rule) + 2.0, // paragraphMarginTop + 8.0, // entryHeaderRowSpacing + 1.0, // entryTitleWeight + 0.45, // entryDateWeight + 12.0); // entrySeparation (roomy editorial gap) + } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTheme.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTheme.java index 5d53b6ec..7f866831 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTheme.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTheme.java @@ -263,6 +263,24 @@ public static CvTheme executive() { CvSpacing.executive(), CvDecoration.classic()); } + + /** + * The "Mint Editorial" look — Poppins throughout, near-black ink, a + * soft mint accent (carried in the palette {@code banner} slot) used + * for the full-width masthead rule, the spaced-caps section + * headings, and the centered tagline. Two-page two-column editorial + * CV: a left sidebar (contact, interests, education, expertise, + * skill bars, social) beside a main column (profile, experience, + * awards, references). Paired 1:1 with the Mint Editorial cover + * letter, which reuses this exact theme. + */ + public static CvTheme mintEditorial() { + return new CvTheme( + CvPalette.mintEditorial(), + CvTypography.mintEditorial(), + CvSpacing.mintEditorial(), + CvDecoration.classic()); + } // -- pre-built text-style helpers ------------------------------------ // Renderers ask the theme for an already-composed DocumentTextStyle // instead of re-assembling font + size + decoration + colour every diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTypography.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTypography.java index 538ce668..8d053584 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTypography.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTypography.java @@ -310,4 +310,23 @@ public static CvTypography executive() { 9.5, // body (V1 BODY_SIZE) 1.25); // line spacing } + + /** + * Poppins headline + body scale for the Mint Editorial preset: a + * 26pt spaced-caps centered name, an 11pt spaced-caps accent section + * heading, and compact 7.4-8pt metadata/body tuned for the dense + * two-column editorial layout. + */ + public static CvTypography mintEditorial() { + return new CvTypography( + FontName.POPPINS, FontName.POPPINS, + 26.0, // headline (spaced-caps centered name) + 7.4, // contact (icon line text) + 11.0, // banner (spaced-caps accent section heading) + 8.0, // entry title (job title / degree label) + 7.4, // entry date (meta) + 7.4, // entry subtitle (school / company) + 8.0, // body (profile / experience) + 1.3); // line spacing + } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/IconTextRow.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/IconTextRow.java new file mode 100644 index 00000000..0ad816ff --- /dev/null +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/IconTextRow.java @@ -0,0 +1,92 @@ +package com.demcha.compose.document.templates.cv.v2.widgets; + +import com.demcha.compose.document.dsl.SectionBuilder; +import com.demcha.compose.document.image.DocumentImageData; +import com.demcha.compose.document.node.DocumentLinkOptions; +import com.demcha.compose.document.node.InlineImageAlignment; +import com.demcha.compose.document.node.TextAlign; +import com.demcha.compose.document.style.DocumentInsets; +import com.demcha.compose.document.style.DocumentTextStyle; + +import java.util.Objects; + +/** + * Inline icon-plus-text row widget — a small glyph image followed by a + * label on the same baseline, optionally wrapped as a single click target. + * + *

What it renders

+ * + *

One left-aligned paragraph holding two inline runs: a centred inline + * image of {@code iconSize}×{@code iconSize}, then three spaces and the + * label text. When a {@link DocumentLinkOptions} is supplied it is applied + * to both the image run and the text run, so the whole row + * (icon + label) is one clickable rectangle in the PDF — mirroring the flat + * Mint Editorial blueprint's {@code iconLine()} contact / social rows.

+ * + *

When to use

+ * + *

Reach for {@code IconTextRow} when a sidebar stacks contact details or + * social links as PNG-glyph rows (phone / email / location / website / + * LinkedIn …) where each entire row should be clickable. It differs from the + * shared {@code ContactLine} variants — those assume pipe-separated text or a + * stacked link list with no per-row glyph — so this is the icon-driven row + * primitive those widgets do not cover.

+ * + *

Reuse

+ * + *

Lives in {@code cv/v2/widgets} as a CV-sidebar primitive. Mint Editorial + * is the first consumer; any future CV preset that wants icon-led contact or + * social rows with a full-row click target can reuse it instead of inlining + * the inline-image + link paragraph again.

+ */ +public final class IconTextRow { + + /** Spacer between the icon glyph and the label text. */ + private static final String GAP = " "; + + private IconTextRow() { + } + + /** + * Renders an icon + text row. + * + * @param host host section the row paragraph is appended to + * @param icon glyph image payload (already decoded / cached by the + * caller); when {@code null} the row renders text only + * @param iconSize icon edge length in points (width == height) + * @param text label text rendered after the icon; a blank label + * still renders the icon, so callers should skip empty + * rows upstream if that is unwanted + * @param style text style for the label + * @param link optional link wrapping the whole row (icon + label); + * {@code null} renders a non-clickable row + * @param margin paragraph margin (vertical rhythm between rows) + */ + public static void render(SectionBuilder host, DocumentImageData icon, + double iconSize, String text, + DocumentTextStyle style, DocumentLinkOptions link, + DocumentInsets margin) { + Objects.requireNonNull(host, "host"); + Objects.requireNonNull(style, "style"); + String label = text == null ? "" : text; + DocumentInsets rowMargin = margin == null ? DocumentInsets.zero() : margin; + + host.addParagraph(paragraph -> { + paragraph.textStyle(style) + .align(TextAlign.LEFT) + .link(link) + .margin(rowMargin) + .rich(rich -> { + if (icon != null) { + rich.image(icon, iconSize, iconSize, + InlineImageAlignment.CENTER, 0.0, link); + } + if (link != null) { + rich.link(GAP + label, link); + } else { + rich.style(GAP + label, style); + } + }); + }); + } +} diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SkillBar.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SkillBar.java new file mode 100644 index 00000000..e60d7629 --- /dev/null +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SkillBar.java @@ -0,0 +1,134 @@ +package com.demcha.compose.document.templates.cv.v2.widgets; + +import com.demcha.compose.document.dsl.SectionBuilder; +import com.demcha.compose.document.node.TextAlign; +import com.demcha.compose.document.style.DocumentInsets; +import com.demcha.compose.document.style.DocumentTextDecoration; +import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; +import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.cv.v2.data.CvSkill; +import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; + +import java.util.Objects; + +/** + * Data-driven proficiency-bar widget — a spaced-caps skill label above a + * thin full-width track with a short vertical marker positioned by the + * skill's proficiency level. + * + *

What it renders

+ * + *

Two stacked elements:

+ * + *
    + *
  1. the skill name in letter-spaced uppercase (bold, ink), via + * {@link TextOrnaments#spacedUpper(String)};
    2. + *
  2. a horizontal track line spanning {@code trackWidth} in the theme + * rule colour, overlaid with a short vertical marker (ink) whose + * left offset is {@code level * trackWidth} — so a higher + * proficiency pushes the tick further right.
    3. + *
+ * + *

The marker is drawn as a second {@code addLine} immediately after the + * track, pulled back up over the track with a negative top margin and + * shifted right with a left margin of {@code level * trackWidth}. This is + * the same overlay trick the flat Mint Editorial blueprint used for its + * {@code skillBar()} (track 0.65pt rule, marker 1.2pt ink, ~8pt tall).

+ * + *

When to use

+ * + *

Reach for {@code SkillBar} when a preset renders skills as visual + * meters rather than plain labels or comma-separated chips — the editorial + * sidebar look. It reads the proficiency from {@link CvSkill#level()}: when + * the level is empty the label renders with no bar (so a + * mixed list of levelled and name-only skills degrades gracefully instead of + * drawing a meaningless empty track).

+ * + *

Reuse

+ * + *

Lives in {@code cv/v2/widgets} because a proficiency meter keyed off + * {@link CvSkill} is CV-specific (no other document family models skill + * levels). Mint Editorial is the first consumer; any future CV preset that + * wants level-driven skill bars can reuse it without re-deriving the marker + * geometry.

+ */ +public final class SkillBar { + + /** Track stroke width in points — a hairline rule. */ + private static final double TRACK_THICKNESS = 0.65; + + /** Proficiency marker stroke width in points — heavier than the track. */ + private static final double MARKER_THICKNESS = 1.2; + + /** Proficiency marker height in points. */ + private static final double MARKER_HEIGHT = 8.0; + + /** Gap (points) between the skill label and the track below it. */ + private static final double LABEL_TO_TRACK_GAP = 8.0; + + /** + * Vertical pull-up (points) applied to the marker so it overlays the + * track instead of stacking below it. Half the marker height plus a + * touch so the tick straddles the track line. + */ + private static final double MARKER_OVERLAP = MARKER_HEIGHT / 2.0 + 0.35; + + /** Gap (points) below the marker before the next skill bar. */ + private static final double BAR_BOTTOM_GAP = 12.0; + + private SkillBar() { + } + + /** + * Renders a skill label and, when the skill carries a proficiency + * level, its proficiency bar. + * + * @param host host section the label + bar are appended to + * @param skill skill to render; its {@link CvSkill#level()} drives + * the marker position (empty level → label only) + * @param trackWidth full track width in points (typically the sidebar + * inner width) + * @param theme active theme — supplies the body font, label/ink + * colour, and the rule colour for the track + */ + public static void render(SectionBuilder host, CvSkill skill, + double trackWidth, CvTheme theme) { + Objects.requireNonNull(host, "host"); + Objects.requireNonNull(skill, "skill"); + Objects.requireNonNull(theme, "theme"); + + boolean levelled = skill.level().isPresent(); + DocumentTextStyle labelStyle = CvTextStyles.of( + theme.typography().bodyFont(), + theme.typography().sizeEntryTitle(), + DocumentTextDecoration.BOLD, + theme.palette().ink()); + // When there is no bar, the label is the whole entry, so give it a + // little breathing room below to match the rhythm of a barred entry. + double labelBottom = levelled ? LABEL_TO_TRACK_GAP : BAR_BOTTOM_GAP; + host.addParagraph(paragraph -> paragraph + .text(TextOrnaments.spacedUpper(skill.name())) + .textStyle(labelStyle) + .align(TextAlign.LEFT) + .margin(DocumentInsets.bottom(labelBottom))); + + if (!levelled) { + return; + } + + double level = skill.level().getAsDouble(); + double markerLeft = Math.max(0.0, Math.min(1.0, level)) * trackWidth; + host.addLine(line -> line + .horizontal(trackWidth) + .color(theme.palette().rule()) + .thickness(TRACK_THICKNESS) + .margin(DocumentInsets.zero())); + host.addLine(line -> line + .vertical(MARKER_HEIGHT) + .color(theme.palette().ink()) + .thickness(MARKER_THICKNESS) + .margin(new DocumentInsets(-MARKER_OVERLAP, 0, + BAR_BOTTOM_GAP, markerLeft))); + } +} diff --git a/src/main/resources/templates/cv/mint-editorial/icons/email.png b/src/main/resources/templates/cv/mint-editorial/icons/email.png new file mode 100644 index 0000000000000000000000000000000000000000..c3369c191a0a4bd1ff12cdfbf8e60184b60fd93d GIT binary patch literal 941 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 F{{!Q<6R`jQ literal 0 HcmV?d00001 diff --git a/src/main/resources/templates/cv/mint-editorial/icons/facebook.png b/src/main/resources/templates/cv/mint-editorial/icons/facebook.png new file mode 100644 index 0000000000000000000000000000000000000000..75e0e24dd38733f8a710c71f730a424ebde67ea0 GIT binary patch literal 1838 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 TUzKkM=5q#5S3j3^P66QGDx zRF*|5$ttK?D_&JcDym;ol13uc=@HP<^M3}6pPRQw*uNW0WEk*tgT((XV7)Q!LD>5k z|9|)Vt|nRx0MO6IdOFr#(_L8@f9p|RVqVa}hR1}SGOWYk@dpO|h327t;$_{p<``y5 z!TJSc5u^Y& z^y}Xoz761*sjjTv$E;#J>8Z|y^-wi2V)WQztl=bHm^E6%H_0IMM6}+zKX38#UX%ZU zPD`1u-)&p#$HiNz9YYSy;-8Ph7p^TSsDr79^SX0WQ`WybYHh|+`|vze119L$I@KcC zKK#j?bIqG-!4U2FQ}_&9Lp2Kz-=Oo(>0OOR&|bnip*=M%6k*j6ahlY5$j=Xp_!*Ly z@MjEiB2{jtK~W2>{i!Ysl(}zRon{#(t(@k`Y)Q*Sr51%E6ws^H(zR`zu!&>SCFp#t z&ELuuy`P{^RDG)!e3fH3@;g-^O2MTax*SPO`)afhTfKp&Y(ke$kL8p&cZ>T)Y_&8~ zk=UB(5<_u;f?y49Bt&SiO;P<=kdl|nhXhg3ldeUn971)GC5pg-=A|o*1ZL5Pb?XTJ zp`FBXg=ZYqyS*>wfDX)~ZavM9Hzs2`fdk6Nzf1@yp2V&P0WbO5V|B;Ycw3BuHR|fR z79^aW+o}efsFqUka{KIF@Qa-Z>Fp@t?W@N+NhfVxz1lY&al3_#?w4Bm3xo<1%LD{a zfyNnH!PV|P6{s6ZucwC4OkPTJ2x<7ym-!WP6`>{U%1`OO_Q(mCw#!eg&%M#rFMQuM zJjk>bcbfj0JEk|W1)$)gCU(AJXFOg0(7BQG@^Z%f2eIxM*y{2$k^J(`d8z&N zO;*9`pFMmpv`aiHD;)&1z~nwgpQDhjOo*{|XoYv$Sl4PKar)GBDE_JRk8Kg%s3r}t zmGetK zap|5d$j$BqdCJz%m`C-OueP6BZ!j!SX|W793H&}5n1LaWFlrMu(_Or;0`l1 zqu(B<7`_sf5wdn=AZvVjHuGee`HILMzjB!N;2~ry&ege1|jy~ zhE(nM6IaF9>{US62$5mx!3XN<&C^MkMmk7B5o{hpj2m;hL=KWAmzsm7`{D{*HA;J) zM*$HA+J4eTUc6)m2|yJAa#Ym_*c@4*_}5@$(gTK{W-}!Cj*GDuGs3L%PvaBt;)5^e z8`nfp9vR-y(O1v)1~Zw6PaqA9E}~s$A;^H;311HVB=CUY^SI_D=NK=TOA4b9SC!xX zcuAm^(ux!ycNz5K!DVArmvHm>-^qJINz0n(8FgIf(2w!SQmXeqOwq`c=zRNFS74zY zZ8p;p7cVD*M~~lQfoa{}D_9oL=1f8;aj|O<@t6dj?N%M4U8IjA~W-}1Om%K@;n<4vPr}v3W5`^KYHl+n9C{0u7H%+Fq^RpZ?1xk8|SQ4HOjRf`yyE`6U=ku z=l#*Ga5WJaz(RScwwNo)1EkdZkG@MmhS;ruKZ^TnCcGhHgPlyKq_^44;jh406?fs_%F@O!oWQ2yCo9Gr zf)csvw%R&_7uwzlti8bHiAX|lR949UL&1_MlSbg1>FVE%Xf5QW+If$Hz7Z}mu71WU z9>w+*k5Xado?gERvTKmopxCo6PxJK}M;{4Y7q0}h-C;DBl3>SQ3A~-}k|xhi9uYN{ ziYtm}5U!u9JHn(DLw3f^kTm-^p>>Ozg<@h>r7{6Zyqiu^$<#aVklkniBOX~ zIQlkdnpjlV9kRqzxV<7Ts#1IlLaORO-_rRYw#QbiI(~IEDi_g$wcZ=i( ze9)a)*kpDVKa2g-z*Gj=%?kb$CiWaH#=B#GJ1x#Wu&&8i}?^uWzH zZjO2D4Mw4TdH#=eE{>IMj^&JK;%v0zzJ1zvc*UE3m0*9=HJH!qiS+Fu@<_8`xEHYI z%JJFpx%}!^2mo0(V@|#o<}W;`gwWpzou njtlK3rFYI{u7QOAJco>bb^A6KpRh=Oh5%!IbG>q1mze(mS?`@n literal 0 HcmV?d00001 diff --git a/src/main/resources/templates/cv/mint-editorial/icons/twitter.png b/src/main/resources/templates/cv/mint-editorial/icons/twitter.png new file mode 100644 index 0000000000000000000000000000000000000000..c43d9de37d99457a0fc3804491d0c262ec054149 GIT binary patch literal 2263 zcmZ`)dpOe#8~)8^lM*?HG(sb6A+*e4Ejf-@Bj>}M$uOijOrmmnlT$gaNGL@rUa4;q zBBMmTPMbm)uT$2Xz5D+8uIu~by{_ke?&ox0&-34N%N~DTL|9H3000q73!DR=z5WX! zz5}{`A*T2Q_qA}a1%Rt+06@DA0Gs?0Z59BcQ2@a40s!<~0FWV@_{uCd}A=rL?0Havio`Z1&#bpGvj#Kw3^Gm9fbIuf!H^mR_8|lX< zKnJCxuZ23Lb<&Waql-rAp!H6jK%vlli)iioKS5YHDab$W-v!p15Gr4Q_}>OfP?%p7 z#XF4r?;3^Es+IgZt1NM5gg{nDQAjAEOR8&6m-_AX?-7s86jk|cMwOxR{ZG(9iOdvN zbq6`JqglReV!}K~scyPhO zwX8Pj&i(UT!sr|&&J3wh%9zTP0YFA4TW`QDbF?c zOQ&Z0$fGX?sum2Ve{+P8DD72gyu^L+5bFX&-hrM@cYx_Y-H^_W6 zdp7{5jd@pZGHhR5Yz!yw+TZBP>+w=z5*xjPh*tp)=2Ik6bw%m@i~Ou8uIoJ5++-vv z>!FTN`#Jj|ByrdQYFJdXV>DeO>40_Sc-B~n!21?BmX7g4E9-qNxH<_?GLLrvk2N;+ z>3sFFpc3eR3uaNC9Ic?nOctzzIVp)?(`j@_cjeTx4sjpq z{4nO!hS!hTV#U+&dftb@DX>lJ>u*T#P2Rz3$2?IKm$8Kv2predkK4mrD1@LZM9Hnj zd7us8=-BipaHc+&gfnJPi_D{eqxyEiyBx{RViOyP+xSxd?ReS-&oc`KIf&LF!GVeF zlw?EG^ZP&E6##s-W_&Fb=mkP32~5uT>J) zLfsmZP1fGFngx_I(ps>Z2jOVP{-~I4;wB^76f_RM2VM9gBb~LUf06jsaGCwMZ}!*)JDSdH!FA0Ic zPdrKLFZailX-Y};+uK{Ca-1v##}4{Otf%>5#Qgd_<96_xIw#KD=hjOy7B}gPnVccV zHu+QKU*%hJm9iDl|T{np8{GX`_sw|-}h?ej1(yjDwSzmH6=Y@lrwwWi8J zZfF>IPgD-ZOH3CRuaeEGQJJbXN3^;@g=1+$3h5cJ9P#O*+fbyj}B~ zu;AA@^Rt-d&{C9`QuessZM#$=`EG{DRO19S!F)8$`Y0o?OtQGGt*1Fzc>A%5TyJX5 zn-r+Fnnx!ixmGhy9;Lv>Xg(f1*d*6i@x+P-mWnxc9L4?gGp0OoJZLfuIeY>TM5rIp z<3J_$7PeWuqX|APSmp*>M830^fR>n`C6ukCciSx5{f<7K-qPG2q>%f?cLRX^CEi$K ziYp5COjs|Bi;()^>H179C*0#5wqfqw;ihO?bqJ7Kw@@?lwpgq=>qvM@F3Ha9-2OuX zdC2C6y0SMhE=;Y|>8Ke=wLyoax4CagROtqKynqm+Stw~I9uK`J7NuV_2~@L4 z%)7#*al(;Z%*hm|p^O8EEC!#Y8`%J%t}_82EPQsq-Xd8H$`M{RB91{WywKH<5`XhS zi(QZly7qxZl;O&XOoYhitG`apvkj>TAoc2$zKlCkuAIEy!aV71zYq(L?HZ{$bo1Hp zA^CZKbjS0{HzLvnm$x@cZxpE%ITSq(94(p((l#v_=MGhhNB@e|wo|r0(Y!ROK%UiZzp~F+Kp~ywO`;`{Ot@2oQ3o&MFEUJqZy7fW54z8HEza%gzgpimpc74Eg)Yife3g zGj!4XX_=&SA@O2m3|B?fw3?msQI}{fR~X;`vw6NPdX=)V(W>~di2vmQ%X4_#Q>@pu Fe*p3N3p4-# literal 0 HcmV?d00001 diff --git a/src/main/resources/templates/cv/mint-editorial/icons/website.png b/src/main/resources/templates/cv/mint-editorial/icons/website.png new file mode 100644 index 0000000000000000000000000000000000000000..3e29e34ab20cef6ca363eacf00d8a0b89288e5cb GIT binary patch literal 1906 zcmZ`)Sv=c`7XI7!OVk#$Ays=!L{J7z6h%o@sl5|TXo!#sT8c!frFvDVR%Q_S(NdHc zI~laqqP2Ev#4?r{t)19vUv7FI?tPkvbH1~D-#KsRJaEHYkdaiC1OPzB$|X*L>NE-w?ch@q!%y zl%=0W@G}XrqYs6Td=}qUiMIXxKrG71)n05tL|$3Y&@JAgmR~v(W$zt@4~z=3#6<@2 z0YJbJW-z!Z%=oMa!o(7eutXva;BZSgJWsUY`@sJTND=su;Mji_Ec?lRU#k1R4N)Pa zAWBpqiTux+W{i;>0EnWU?9d+G?aMhNvd34&PU>va2>!|AS4sHoe;G$)5z?bVZ$EGm zo35=tf2iTMdfxAO#Yy6va=cz&ZC%le&oOf@PGHL-x=Fn+I9gQg-A#w!$E6Gxnoj*PYbmfk` zO6#JERh=%`7webFxGX2>#r1f`APUayR<@lym5LeuLYzq{3y<)TW5(zqdd=djIg<;g z6hT==X=O@7KlmlqP)vd4u}_K4t}D}n&R^5&q9g55uM);23dqhgZ1>6L<{e2|YcD$k zEZ_-3J$xWBUph*^17UZ^bb+=9GOp#5g}*(wVzGW7)t6Ld+$~9cGTgK>C2cU!P%vjo zFQbel;7HT-hA**+_`{LtT{%4)vty7Vr@D_qUwQz43nFRMYOUSW z579a@TYYAbsZU9w zIXh3uOjQdx%VN&PGE2l%q2c%y1E;Y&Qtg#$;d}7e>9}rZh51Q&(+-tiW_9g;gma3V^tkr z0LHdk67 zDT*5J@RfB5TP%VQCeq~X?;okB>^wYAzkhXRglc_|(kQ@=DPj*&5;J$HIMR(ljjf_K zjK}0=Vgp*VjVu*my(}@og;*Y!qz9<1>YLZ?*djPRWBYamAP?8+gcJPJ!#%K)J!nVY zRm0D=RRo6qoO7i##wPZi_{->ESsmf0-@-i6LT8jozYlD7|5$Amd2xKAms8_BZtHOP zB7Aj1#^S{a^8HrLc!6J-d2MC0`>!&i92|Exd*6W9mKF(FZN9~GGE*04vC8Z>o>dSU z%kB#mhs2h(4OUnEUFLV{H8)D+;%QG4WB`Jq&xst%DVc_7$^Vgy3Kz;fRjDO JuF@7u{||dJVB-J) literal 0 HcmV?d00001 diff --git a/src/test/java/com/demcha/compose/document/templates/coverletter/v2/presets/CoverLetterV2SmokeTest.java b/src/test/java/com/demcha/compose/document/templates/coverletter/v2/presets/CoverLetterV2SmokeTest.java index 85452b24..5cbf664f 100644 --- a/src/test/java/com/demcha/compose/document/templates/coverletter/v2/presets/CoverLetterV2SmokeTest.java +++ b/src/test/java/com/demcha/compose/document/templates/coverletter/v2/presets/CoverLetterV2SmokeTest.java @@ -75,7 +75,9 @@ private static Stream presets() { Arguments.of((Supplier>) MonogramSidebarLetter::create, "monogram-sidebar-letter", "Monogram Sidebar Letter"), Arguments.of((Supplier>) TimelineMinimalLetter::create, - "timeline-minimal-letter", "Timeline Minimal Letter")); + "timeline-minimal-letter", "Timeline Minimal Letter"), + Arguments.of((Supplier>) MintEditorialLetter::create, + "mint-editorial-letter", "Mint Editorial Letter")); } private static CoverLetterDocument sampleDocument() { diff --git a/src/test/java/com/demcha/compose/document/templates/cv/v2/data/SkillsSectionTest.java b/src/test/java/com/demcha/compose/document/templates/cv/v2/data/SkillsSectionTest.java index f01ddab1..5cd01e92 100644 --- a/src/test/java/com/demcha/compose/document/templates/cv/v2/data/SkillsSectionTest.java +++ b/src/test/java/com/demcha/compose/document/templates/cv/v2/data/SkillsSectionTest.java @@ -11,7 +11,7 @@ class SkillsSectionTest { @Test void skillGroup_trims_category_and_skips_blank_skills() { - SkillGroup group = new SkillGroup(" Languages ", + SkillGroup group = SkillGroup.ofNames(" Languages ", List.of(" Java 21 ", "", "Kotlin")); assertThat(group.category()).isEqualTo("Languages"); @@ -19,11 +19,34 @@ void skillGroup_trims_category_and_skips_blank_skills() { assertThat(group.skillsInline()).isEqualTo("Java 21, Kotlin"); } + @Test + void skillGroup_carries_optional_levels_without_affecting_names() { + SkillGroup group = new SkillGroup("Design", List.of( + CvSkill.of("Illustration", 0.9), + CvSkill.of("Typography"))); + + // Name-only view is unchanged whether or not levels are present. + assertThat(group.skills()).containsExactly("Illustration", "Typography"); + // Levels are readable by data-driven renderers. + assertThat(group.entries()).hasSize(2); + assertThat(group.entries().get(0).level().getAsDouble()).isEqualTo(0.9); + assertThat(group.entries().get(1).level()).isEmpty(); + } + + @Test + void cvSkill_clamps_level_via_factory_and_rejects_blank_name() { + assertThat(CvSkill.of("X", 1.5).level().getAsDouble()).isEqualTo(1.0); + assertThat(CvSkill.of("X", -0.2).level().getAsDouble()).isEqualTo(0.0); + assertThatThrownBy(() -> CvSkill.of(" ")) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("name"); + } + @Test void skillsSection_keeps_non_empty_groups_only() { SkillsSection section = SkillsSection.builder("Technical Skills") .group("Languages", "Java 21", "Kotlin") - .group(new SkillGroup("Empty", List.of())) + .group(SkillGroup.ofNames("Empty", List.of())) .group("Testing", "JUnit 5") .build(); diff --git a/src/test/java/com/demcha/compose/document/templates/cv/v2/presets/CvV2VisualParityTest.java b/src/test/java/com/demcha/compose/document/templates/cv/v2/presets/CvV2VisualParityTest.java index a36090a1..addd9e78 100644 --- a/src/test/java/com/demcha/compose/document/templates/cv/v2/presets/CvV2VisualParityTest.java +++ b/src/test/java/com/demcha/compose/document/templates/cv/v2/presets/CvV2VisualParityTest.java @@ -6,6 +6,7 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.cv.v2.data.CvDocument; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.v2.data.CvSkill; import com.demcha.compose.document.templates.cv.v2.data.EntriesSection; import com.demcha.compose.document.templates.cv.v2.data.ParagraphSection; import com.demcha.compose.document.templates.cv.v2.data.RowStyle; @@ -17,6 +18,7 @@ import org.junit.jupiter.params.provider.MethodSource; import java.nio.file.Path; +import java.util.List; import java.util.function.Supplier; import java.util.stream.Stream; @@ -158,26 +160,50 @@ private static CvDocument canonicalDocument() { + "high-throughput PDF rendering, semantic authoring " + "DSLs, and turning brittle production-ops scripts " + "into typed, snapshot-tested libraries that scale.")) + // Skill names match the name-only form exactly; only + // optional proficiency levels are added so data-driven + // presets (Mint Editorial) can render meters. Name-only + // presets read SkillGroup.skills() and render identically, + // so the existing baselines are unaffected. .section(SkillsSection.builder("Technical Skills") - .group("Languages", "Java 21", "Kotlin", "Groovy", - "Python", "SQL") - .group("Document & Print", "PDFBox", - "Apache POI (DOCX/XLSX)", "iText", - "PostScript", "ICC colour profiles", - "font metrics") - .group("Layout engines", "Custom DSL design", - "semantic layout trees", "pagination", - "snapshot testing", "visual regression") - .group("Build & infrastructure", "Maven", "Gradle", - "GitHub Actions", "JitPack", "Docker", - "JMH benchmarking") - .group("Testing", "JUnit 5", "AssertJ", - "PDFBox-based PNG diff", - "layout-graph snapshots", - "mutation testing (Pitest)") - .group("Distribution", "Maven Central", - "Sonatype OSSRH", "GPG signing", "JitPack", - "semantic versioning discipline") + .leveledGroup("Languages", List.of( + CvSkill.of("Java 21", 0.95), + CvSkill.of("Kotlin", 0.85), + CvSkill.of("Groovy", 0.7), + CvSkill.of("Python", 0.75), + CvSkill.of("SQL", 0.8))) + .leveledGroup("Document & Print", List.of( + CvSkill.of("PDFBox", 0.9), + CvSkill.of("Apache POI (DOCX/XLSX)", 0.7), + CvSkill.of("iText", 0.65), + CvSkill.of("PostScript", 0.6), + CvSkill.of("ICC colour profiles", 0.55), + CvSkill.of("font metrics", 0.7))) + .leveledGroup("Layout engines", List.of( + CvSkill.of("Custom DSL design", 0.9), + CvSkill.of("semantic layout trees", 0.85), + CvSkill.of("pagination", 0.85), + CvSkill.of("snapshot testing", 0.8), + CvSkill.of("visual regression", 0.8))) + .leveledGroup("Build & infrastructure", List.of( + CvSkill.of("Maven", 0.9), + CvSkill.of("Gradle", 0.75), + CvSkill.of("GitHub Actions", 0.85), + CvSkill.of("JitPack", 0.8), + CvSkill.of("Docker", 0.7), + CvSkill.of("JMH benchmarking", 0.65))) + .leveledGroup("Testing", List.of( + CvSkill.of("JUnit 5", 0.9), + CvSkill.of("AssertJ", 0.85), + CvSkill.of("PDFBox-based PNG diff", 0.8), + CvSkill.of("layout-graph snapshots", 0.8), + CvSkill.of("mutation testing (Pitest)", 0.6))) + .leveledGroup("Distribution", List.of( + CvSkill.of("Maven Central", 0.8), + CvSkill.of("Sonatype OSSRH", 0.75), + CvSkill.of("GPG signing", 0.7), + CvSkill.of("JitPack", 0.8), + CvSkill.of("semantic versioning discipline", 0.85))) .build()) .section(EntriesSection.builder("Education & Certifications") .entry("MSc Computer Science", diff --git a/src/test/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorialSmokeTest.java b/src/test/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorialSmokeTest.java new file mode 100644 index 00000000..ffa43d51 --- /dev/null +++ b/src/test/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorialSmokeTest.java @@ -0,0 +1,168 @@ +package com.demcha.compose.document.templates.cv.v2.presets; + +import com.demcha.compose.GraphCompose; +import com.demcha.compose.document.api.DocumentPageSize; +import com.demcha.compose.document.api.DocumentSession; +import com.demcha.compose.document.layout.LayoutGraph; +import com.demcha.compose.document.templates.api.DocumentTemplate; +import com.demcha.compose.document.templates.cv.v2.data.CvDocument; +import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; +import com.demcha.compose.document.templates.cv.v2.data.CvSkill; +import com.demcha.compose.document.templates.cv.v2.data.EntriesSection; +import com.demcha.compose.document.templates.cv.v2.data.ParagraphSection; +import com.demcha.compose.document.templates.cv.v2.data.RowStyle; +import com.demcha.compose.document.templates.cv.v2.data.RowsSection; +import com.demcha.compose.document.templates.cv.v2.data.SkillsSection; +import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Smoke test for the v2 Mint Editorial preset. Covers stable identity, + * the two-page atomic-row composition against the full canonical sample + * (including level-driven skill bars and the Awards / References grids), + * and graceful degradation when the optional sidebar/main sections are + * absent. + */ +class MintEditorialSmokeTest { + + @Test + void exposes_stable_identity() { + DocumentTemplate template = MintEditorial.create(); + assertThat(template.id()).isEqualTo("mint-editorial"); + assertThat(template.displayName()).isEqualTo("Mint Editorial"); + } + + @Test + void default_factory_renders_two_pages() throws Exception { + try (DocumentSession session = GraphCompose.document() + .pageSize(DocumentPageSize.A4) + .margin(48, 48, 48, 48) + .create()) { + MintEditorial.create().compose(session, fullDocument()); + assertThat(session.roots()).isNotEmpty(); + LayoutGraph layout = session.layoutGraph(); + // The preset emits two atomic page rows. The dense fullDocument + // fills page 1, so the second (atomic) row flows whole onto + // page 2 — a clean two-page document with neither row overflowing. + assertThat(layout.totalPages()).isEqualTo(2); + } + } + + @Test + void custom_theme_factory_renders() throws Exception { + try (DocumentSession session = GraphCompose.document() + .pageSize(DocumentPageSize.A4) + .margin(48, 48, 48, 48) + .create()) { + MintEditorial.create(CvTheme.mintEditorial()) + .compose(session, fullDocument()); + assertThat(session.roots()).isNotEmpty(); + } + } + + @Test + void renders_with_awards_and_references_grids() throws Exception { + try (DocumentSession session = GraphCompose.document() + .pageSize(DocumentPageSize.A4) + .margin(48, 48, 48, 48) + .create()) { + MintEditorial.create().compose(session, documentWithAwardsAndReferences()); + assertThat(session.roots()).isNotEmpty(); + } + } + + @Test + void degrades_when_optional_sections_absent() throws Exception { + // Only identity + profile + a single experience entry — no skills, + // education, interests, awards, references or social. + CvDocument minimal = CvDocument.builder() + .identity(CvIdentity.builder() + .name("Jane", "Doe") + .jobTitle("Designer") + .contact("+44 0", "j@d.com", "London") + .build()) + .sections( + new ParagraphSection("Profile", "Builds **clean** layouts."), + EntriesSection.builder("Professional Experience") + .entry("Designer", "Acme", "2021-2024", "Did design.") + .build()) + .build(); + try (DocumentSession session = GraphCompose.document() + .pageSize(DocumentPageSize.A4) + .margin(48, 48, 48, 48) + .create()) { + MintEditorial.create().compose(session, minimal); + assertThat(session.roots()).isNotEmpty(); + } + } + + private static CvDocument fullDocument() { + return CvDocument.builder() + .identity(CvIdentity.builder() + .name("Jordan", "Rivera") + .jobTitle("Platform Engineer") + .contact("+44 20 5555 1000", "jordan.rivera@example.com", + "London, UK") + .link("LinkedIn", "https://linkedin.com/in/jordan-rivera-demo") + .link("GitHub", "https://github.com/jrivera-demo") + .build()) + .sections( + new ParagraphSection("Professional Summary", + "Platform engineer building **resilient** document " + + "pipelines and developer-facing template systems."), + SkillsSection.builder("Technical Skills") + .leveledGroup("Languages", List.of( + CvSkill.of("Java 21", 0.95), + CvSkill.of("Kotlin", 0.85), + CvSkill.of("SQL", 0.8))) + .leveledGroup("Testing", List.of( + CvSkill.of("JUnit 5", 0.9), + CvSkill.of("AssertJ", 0.85))) + .build(), + EntriesSection.builder("Education & Certifications") + .entry("MSc Computer Science", + "University of Manchester", "2019-2021", + "Distinction.") + .entry("BSc Software Engineering", + "Imperial College London", "2015-2019", + "First-class honours.") + .build(), + EntriesSection.builder("Professional Experience") + .entry("Senior Platform Engineer", "Northwind Systems", + "2024-Present", "Led the document platform.") + .entry("Software Engineer", "BrightLeaf Labs", + "2021-2024", "Built rendering pipelines.") + .entry("Backend Engineer", "Helix Print Co", + "2019-2021", "Maintained invoice printing.") + .build()) + .build(); + } + + private static CvDocument documentWithAwardsAndReferences() { + return CvDocument.builder() + .identity(CvIdentity.builder() + .name("Jordan", "Rivera") + .jobTitle("Designer") + .contact("+44 0", "j@d.com", "London") + .link("LinkedIn", "https://linkedin.com/in/jordan") + .build()) + .sections( + new ParagraphSection("Profile", "Designs editorial layouts."), + EntriesSection.builder("Professional Experience") + .entry("Designer", "Acme", "2021-2024", "Did design.") + .build(), + RowsSection.builder("Awards", RowStyle.PLAIN) + .row("Best Layout", "Design Guild | 2023") + .row("Editorial Prize", "Type Society | 2022") + .build(), + RowsSection.builder("References", RowStyle.PLAIN) + .row("Alex Stone", "Acme | alex@acme.com") + .row("Sam Reed", "BrightLeaf | sam@bl.com") + .build()) + .build(); + } +} diff --git a/src/test/java/com/demcha/compose/document/templates/cv/v2/widgets/WidgetSmokeTest.java b/src/test/java/com/demcha/compose/document/templates/cv/v2/widgets/WidgetSmokeTest.java index 984ef065..d423d21e 100644 --- a/src/test/java/com/demcha/compose/document/templates/cv/v2/widgets/WidgetSmokeTest.java +++ b/src/test/java/com/demcha/compose/document/templates/cv/v2/widgets/WidgetSmokeTest.java @@ -2,6 +2,7 @@ import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentSession; +import com.demcha.compose.document.image.DocumentImageData; import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.style.DocumentInsets; @@ -9,6 +10,7 @@ import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.cv.v2.data.CvName; +import com.demcha.compose.document.templates.cv.v2.data.CvSkill; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import com.demcha.compose.font.FontName; import org.junit.jupiter.api.Test; @@ -77,6 +79,31 @@ void subheadline_variants_render_without_throwing() throws Exception { theme.bodyStyle())); } + @Test + void skillBar_renders_with_and_without_level() throws Exception { + CvTheme theme = CvTheme.mintEditorial(); + // Levelled skill → label + proficiency bar. + renderWithSection(section -> + SkillBar.render(section, CvSkill.of("Java 21", 0.9), 120, theme)); + // Name-only skill → label, no bar (graceful degrade). + renderWithSection(section -> + SkillBar.render(section, CvSkill.of("Kotlin"), 120, theme)); + } + + @Test + void iconTextRow_renders_with_and_without_link() throws Exception { + CvTheme theme = CvTheme.mintEditorial(); + DocumentImageData icon = DocumentImageData.fromBytes(readMintIcon("phone.png")); + // Linked row (whole row clickable) and plain row. + renderWithSection(section -> IconTextRow.render(section, icon, 9.0, + "hello@example.com", theme.bodyStyle(), + new com.demcha.compose.document.node.DocumentLinkOptions( + "mailto:hello@example.com"), + DocumentInsets.bottom(12))); + renderWithSection(section -> IconTextRow.render(section, icon, 9.0, + "London, UK", theme.bodyStyle(), null, DocumentInsets.bottom(12))); + } + @Test void sectionHeader_variants_render_without_throwing() throws Exception { CvTheme theme = CvTheme.boxedClassic(); @@ -187,6 +214,14 @@ private static void renderWithFlow(FlowAction action) throws Exception { } } + private static byte[] readMintIcon(String fileName) throws Exception { + try (var input = WidgetSmokeTest.class.getResourceAsStream( + "/templates/cv/mint-editorial/icons/" + fileName)) { + assertThat(input).as("mint editorial icon %s", fileName).isNotNull(); + return input.readAllBytes(); + } + } + private static CvName name() { return CvName.of("Jane", "Doe"); } From 58778f320ce306a41da2ad4359e8bddf8f0a2228 Mon Sep 17 00:00:00 2001 From: DemchaAV Date: Sat, 30 May 2026 01:53:14 +0100 Subject: [PATCH 2/4] chore(showcase): guard + auto-bump docs/index.html version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit docs/index.html hardcodes the version in five spots (JSON-LD softwareVersion, JitPack downloadUrl, hero badge, Maven + Gradle install snippets) that do not inherit from the pom — they had silently drifted to v1.6.1 while the library shipped v1.6.4 because nothing bumped or guarded them. - VersionConsistencyGuardTest.showcaseSiteVersionMatchesTheProjectVersion: fails the verify gate if any of the five spots lags behind the root pom, matching the existing guard on the README install snippets. - cut-release.ps1 Update-IndexHtmlVersion: bumps all five spots in lockstep with README + poms during the release commit, and stages docs/index.html alongside the rest of the release artefacts. - SHOWCASE.md: rewritten to match reality — previews and the gallery manifest are auto-generated by ShowcaseSync under docs/showcase/ (pdf + screenshots), not hand-edited under docs/assets/ as the old doc claimed. --- docs/SHOWCASE.md | 110 ++++++++++++------ scripts/cut-release.ps1 | 51 +++++++- .../VersionConsistencyGuardTest.java | 32 ++++- 3 files changed, 152 insertions(+), 41 deletions(-) diff --git a/docs/SHOWCASE.md b/docs/SHOWCASE.md index c0a12903..5e2a30ef 100644 --- a/docs/SHOWCASE.md +++ b/docs/SHOWCASE.md @@ -1,51 +1,85 @@ # GraphCompose GitHub Pages Showcase -This folder contains the lightweight static showcase site for GraphCompose. It is intentionally plain HTML, CSS, JavaScript, and JSON so GitHub Pages can publish it directly from the main repository without a build step. +This folder is the static showcase site for GraphCompose. It is plain HTML, +CSS, JavaScript, and a generated JSON manifest, so GitHub Pages publishes it +directly from the main repository with no build step. ## Files -- `index.html` is the single-page showcase. -- `styles.css` contains the visual system and responsive layout. -- `examples.json` is the gallery data source. -- `assets/logo/` contains the showcase logo asset. -- `assets/screenshots/` contains PNG previews for generated PDFs. -- `assets/pdf/` contains the generated PDF examples linked from the gallery. - -## Add A New Showcase Item - -1. Generate the PDF from the examples module. -2. Copy the PDF into `docs/assets/pdf/`. -3. Add a PNG screenshot into `docs/assets/screenshots/`. -4. Add a new object to `docs/examples.json`. -5. Commit and push. - -Each `examples.json` object uses this shape: - -```json -{ - "title": "Cinematic Invoice", - "description": "A short description of the generated document.", - "tags": ["Template", "Tables", "Theme"], - "image": "assets/screenshots/invoice-v2.png", - "pdf": "assets/pdf/invoice-v2.pdf", - "code": "https://github.com/DemchaAV/GraphCompose/blob/main/examples/src/main/java/com/demcha/examples/InvoiceCinematicFileExample.java" -} -``` +- `index.html` — the single-page showcase. Holds the hero, install snippets, + feature/architecture sections, and the searchable gallery shell. +- `styles.css` — the visual system and responsive layout. +- `examples.js` — client script that fetches the manifest and renders the + gallery (search, category filters, highlights strip, lightbox). +- `examples.json` — **generated** gallery manifest. Do **not** hand-edit it; + it is rewritten by `ShowcaseSync` (see below). +- `assets/logo/` — the showcase logo asset. +- `showcase/pdf///…` — generated PDF examples linked from the + gallery. +- `showcase/screenshots///…` — PNG previews auto-rendered from + those PDFs. -## Local Preview +> Older revisions of this doc referenced `docs/assets/screenshots` and +> `docs/assets/pdf` plus a manual "copy the PDF, add a PNG, edit examples.json" +> flow. That is no longer accurate — previews and the manifest are generated +> under `docs/showcase/**` by `ShowcaseSync`. -Open `docs/index.html` directly in a browser for a quick visual check. If your browser blocks `fetch("examples.json")` for local `file://` pages, run any tiny static server from the repository root and open the `/docs/` path. No build step is required. +## Add a new showcase item -## GitHub Pages +The gallery is driven by code, not by hand-editing JSON. Source of truth: +`examples/src/main/java/com/demcha/examples/support/ShowcaseMetadata.java`. + +1. Add the example `.java` under the right category sub-package in + `examples/src/main/java/com/demcha/examples/`. +2. Make it write its PDF via `ExampleOutputPaths.prepare(category, fileName)` + so the output lands under the matching `examples/target/generated-pdfs/` + subfolder. +3. Wire it into `GenerateAllExamples.main`. +4. Register a metadata entry in `ShowcaseMetadata.java` (title, one-line + description, search tags, source link) keyed by the generated PDF basename. +5. Regenerate, then sync: + + ```bash + ./mvnw -f examples/pom.xml exec:java -Dexec.mainClass=com.demcha.examples.GenerateAllExamples + ./mvnw -f examples/pom.xml exec:java -Dexec.mainClass=com.demcha.examples.support.ShowcaseSync + ``` + + `ShowcaseSync` copies each PDF into `docs/showcase/pdf/…`, rasterises a PNG + into `docs/showcase/screenshots/…`, and rewrites `docs/examples.json`. +6. Commit the regenerated `docs/showcase/**` assets and `docs/examples.json`. + +## Version and source links -To publish this site with GitHub Pages: +- The displayed version lives **only** in `index.html` (JSON-LD + `softwareVersion`, the JitPack download URL, the hero badge, and the Maven + + Gradle install snippets). It does not inherit from the pom. +- `scripts/cut-release.ps1` flips all of those — plus the README and poms — to + the release tag in the release commit, and `VersionConsistencyGuardTest` + fails the `verify` gate if any of them drift out of sync with the library + `pom.xml`. Do not hand-bump the site version ahead of a release. +- "View source" links resolve through `ShowcaseMetadata.GH_BASE`, which + `cut-release.ps1` flips between `/blob/develop` (while developing) and + `/blob/v` (at release) so the deployed site points at the exact source + that produced each artefact. -1. Open repository Settings. -2. Go to Pages. -3. Set Source to "Deploy from a branch". -4. Select the main branch and `/docs` folder. -5. Save. +## Local preview + +The gallery uses `fetch("examples.json")`, which browsers block for local +`file://` pages. Run any tiny static server from the repository root and open +the `/docs/` path: + +```bash +python -m http.server 8000 +# then open http://localhost:8000/docs/ +``` + +Opening `docs/index.html` directly still renders everything except the +JS-driven gallery (the `