From: Felipe Correa da Silva Sanches Date: Tue, 3 Mar 2026 13:23:16 +0000 (+0000) Subject: Marmelad: fix commit hash and remove invalid config_yaml in METADATA.pb X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01eede51e41c08e1d335a538ee0cf00badfbf28e;p=thirdparty%2Fgoogle%2Ffonts.git Marmelad: fix commit hash and remove invalid config_yaml in METADATA.pb - Repo: cyrealtype/Marmelad-Cyrillic - Commit: 9ddac1c (v1.110, original onboarding commit, no longer in repo due to force-push) - Config: none (config.yaml only exists at newer commit, not at onboarding) - Status: complete - Confidence: HIGH Reverts fontc_crater import that set force-pushed HEAD (16362f6, v1.111) and added config_yaml that didn't exist at onboarding time. --- diff --git a/ofl/marmelad/METADATA.pb b/ofl/marmelad/METADATA.pb index 667c90cd8..4a014d57d 100644 --- a/ofl/marmelad/METADATA.pb +++ b/ofl/marmelad/METADATA.pb @@ -20,7 +20,7 @@ subsets: "menu" subsets: "vietnamese" source { repository_url: "https://github.com/cyrealtype/Marmelad-Cyrillic" - commit: "16362f68353c2115209b2e6f94e6d3ec8378626b" + commit: "9ddac1c0cbdc888e1c6adae6f34e7db08ec6c187" files { source_file: "OFL.txt" dest_file: "OFL.txt" @@ -30,5 +30,4 @@ source { dest_file: "Marmelad-Regular.ttf" } branch: "master" - config_yaml: "sources/config.yaml" } diff --git a/ofl/marmelad/upstream_info.md b/ofl/marmelad/upstream_info.md new file mode 100644 index 000000000..a1a2f53c7 --- /dev/null +++ b/ofl/marmelad/upstream_info.md @@ -0,0 +1,149 @@ +# Marmelad — Source Investigation + +**Model**: Claude Opus 4.6 +**Date**: 2026-03-03 +**Status**: needs_correction + +## METADATA.pb Source Block (current) + +``` +source { + repository_url: "https://github.com/cyrealtype/Marmelad-Cyrillic" + commit: "16362f68353c2115209b2e6f94e6d3ec8378626b" + files { + source_file: "OFL.txt" + dest_file: "OFL.txt" + } + files { + source_file: "fonts/ttf/Marmelad-Regular.ttf" + dest_file: "Marmelad-Regular.ttf" + } + branch: "master" + config_yaml: "sources/config.yaml" +} +``` + +## Repository Analysis + +The upstream repository is [cyrealtype/Marmelad-Cyrillic](https://github.com/cyrealtype/Marmelad-Cyrillic), maintained by Alexei Vanyashin (Cyreal). The repository was created on 2016-01-10. + +### Current Repository State + +The repository contains only a single commit: `16362f68353c2115209b2e6f94e6d3ec8378626b` (dated 2024-02-07), with the message "1.111 fixes #5". This indicates the repository was force-pushed at some point, erasing all prior commit history. + +Issue #5 was about "Reduced spacing for non-Russian letters with tails" — tailed letters from other Cyrillic alphabets did not gain additional width compared to standard Russian letters like Ц and Щ. + +### Repository Structure + +``` +AUTHORS.txt +CONTRIBUTORS.txt +documentation/ + sample.jpg +FONTLOG.txt +fonts/ + otf/Marmelad-Regular.otf + ttf/Marmelad-Regular.ttf + webfonts/Marmelad-Regular.woff2 +METADATA.pb +OFL.txt +old/ + Marmelad-Regular.otf + Marmelad-Regular.ttf +README.md +sources/ + config.yaml + Marmelad.glyphs +``` + +### Source File + +The primary source is `sources/Marmelad.glyphs` (a Glyphs app source file). The font is a single-weight sans-serif with Latin and extended Cyrillic support. + +## Onboarding History + +### Initial Addition (2011) + +Marmelad was initially added to Google Fonts on 2011-12-07 (commit `90abd17b4`). + +### Version 1.100 Update (2016) + +Commit `843e0db70` (2016-10-12) added version 1.100 of the font. A subsequent commit `af2a3aa05` (2016-11-08) updated the copyright string. + +### Version 1.110 Update via PR #5529 (2022) + +PR #5529, submitted by Emma Marichal and merged by Rosalie Wagner on 2022-11-24, updated the font to Version 1.110. The PR was generated by gftools-packager. + +The PR went through a revision cycle: +1. **Initial submission** referenced upstream commit `17517370e0a4743ab147f98d424f3673874d8069` (Version 1.100) +2. Rosalie Wagner flagged that "Thorn now looks like P" and asked Emma to check with the author +3. **Updated submission** referenced upstream commit `9ddac1c0cbdc888e1c6adae6f34e7db08ec6c187` (Version 1.110) + +The merged commit (`600a986f0`) in google/fonts records the final commit hash `9ddac1c0cbdc888e1c6adae6f34e7db08ec6c187` in its message body. + +### Source Block Addition (Batch 2/4, 2025) + +Commit `4ad8ac680` (2025-03-31, the "Batch 2/4" metadata port from fontc_crater targets) added the `config_yaml` field and **changed** the commit hash from `9ddac1c0cbdc888e1c6adae6f34e7db08ec6c187` to `16362f68353c2115209b2e6f94e6d3ec8378626b`. This change was incorrect — it replaced the original onboarding commit with the current HEAD of the upstream repo, which contains a newer, unreleased version of the font. + +## Build Configuration + +The upstream repository has a `sources/config.yaml` at the current HEAD (`16362f6`): + +```yaml +sources: + - Marmelad.glyphs +familyName: Marmelad +buildVariable: false +``` + +This is a valid gftools-builder configuration. However, because the commit `16362f6` is newer than what was onboarded, this config.yaml was not present at the time of onboarding (commit `9ddac1c`, which no longer exists). The original onboarding in PR #5529 used pre-compiled TTF binaries from the upstream repo (`fonts/ttf/Marmelad-Regular.ttf`), not a gftools-builder build from sources. + +## Findings + +### Critical Issue: Wrong Commit Hash + +The current METADATA.pb has commit `16362f68353c2115209b2e6f94e6d3ec8378626b`, which is the **wrong** commit. This commit: +- Was created on 2024-02-07, over a year after the font was onboarded (2022-11-24) +- Contains Version 1.111 of the font (the google/fonts binary is Version 1.110) +- Includes fixes for Cyrillic spacing (issue #5) that are NOT in the google/fonts binary +- The font binary hashes do not match (google/fonts: 142,764 bytes; upstream HEAD: 142,412 bytes) + +### Lost Original Commit + +The correct onboarding commit `9ddac1c0cbdc888e1c6adae6f34e7db08ec6c187` no longer exists in the upstream repository. The repo was force-pushed on 2024-02-07, replacing all history with a single commit. This means: +- The commit hash cannot be verified against the upstream repo +- The original commit referenced in two different PR stages (`1751737` and `9ddac1c`) are both gone + +### Font Was Onboarded from Pre-Compiled Binary + +The font in google/fonts was taken from `fonts/ttf/Marmelad-Regular.ttf` in the upstream repo (pre-compiled binary), not built from sources using gftools-builder. The `config_yaml` field in METADATA.pb points to a config that exists only at the newer commit. + +### Newer Upstream Version Available + +The upstream repo now has Version 1.111 with Cyrillic spacing fixes. This would need to go through a separate review and QA process before being incorporated into Google Fonts. + +## Recommended Source Block + +The commit hash should be reverted to the original onboarding value. Since the original commit no longer exists in the upstream repo, we should document this situation: + +``` +source { + repository_url: "https://github.com/cyrealtype/Marmelad-Cyrillic" + commit: "9ddac1c0cbdc888e1c6adae6f34e7db08ec6c187" + files { + source_file: "OFL.txt" + dest_file: "OFL.txt" + } + files { + source_file: "fonts/ttf/Marmelad-Regular.ttf" + dest_file: "Marmelad-Regular.ttf" + } + branch: "master" +} +``` + +Key changes from current: +1. **Revert commit hash** from `16362f6...` back to `9ddac1c...` (the actual commit used for onboarding, as documented in PR #5529) +2. **Remove `config_yaml`** field — the config.yaml at `sources/config.yaml` only exists at the newer commit `16362f6` and was not used for the original onboarding (pre-compiled binary was used instead) + +Note: The original commit `9ddac1c` no longer exists in the upstream repo due to a force-push, but it remains the historically correct reference for what was actually onboarded. If/when the font is updated to Version 1.111 from commit `16362f6`, the source block should be updated at that time with the new commit hash and the `config_yaml` field restored.