More fixups

This commit is contained in:
be5invis 2023-11-11 18:11:27 -08:00
parent cff60d3c99
commit 560ffcb304
4 changed files with 26 additions and 10 deletions

View file

@ -756,7 +756,7 @@ at = "fourfold"
percent = "rings-continuous-slash" percent = "rings-continuous-slash"
micro-sign = "toothed-serifless" micro-sign = "toothed-serifless"
[buildPlans.IosevkaAile.widths.normal] [buildPlans.IosevkaAile.widths.Normal]
shape = 600 shape = 600
menu = 5 menu = 5
css = "normal" css = "normal"
@ -797,7 +797,7 @@ w = "straight-flat-top-motion-serifed"
long-s = "flat-hook-tailed" long-s = "flat-hook-tailed"
eszet = "longs-s-lig-tailed-serifless" eszet = "longs-s-lig-tailed-serifless"
[buildPlans.IosevkaEtoile.widths.normal] [buildPlans.IosevkaEtoile.widths.Normal]
shape = 600 shape = 600
menu = 5 menu = 5
css = "normal" css = "normal"

View file

@ -1,6 +1,7 @@
* \[**BREAKING**\] The filenames and package filenames are changed. * \[**BREAKING**\] The filenames and package filenames are changed.
- They will now use PascalCase instead of kebab-case. - They will now use PascalCase instead of kebab-case.
- To package manager maintainers: Please upgrade your script to make it capable to download and install the fonts under new names, and properly uninstall the fonts under old names. - To package manager maintainers: Please upgrade your script to make it capable to download and install the fonts under new names, and properly uninstall the fonts under old names.
* \[**BREAKING**\] The "SGr" TTC packages for Iosevka Aile and Etoile will no longer be generated, as they are duplicates to the non-SGr TTC packages.
* \[**BREAKING**\] Reorder of glyph variants: * \[**BREAKING**\] Reorder of glyph variants:
- Influenced characters: `M`, `R`, `f`, `t`, `x`, Long S (`ſ`), Lower Chi (`χ`), Cyrillic Lower Em (`м`), Cyrillic Ya (`Я`, `я`), `5`. - Influenced characters: `M`, `R`, `f`, `t`, `x`, Long S (`ſ`), Lower Chi (`χ`), Cyrillic Lower Em (`м`), Cyrillic Ya (`Я`, `я`), `5`.
* \[**BREAKING**\] Tags for variant features for Cyrillic lowercase Er and U are changed to `cv76` and `cv78`. * \[**BREAKING**\] Tags for variant features for Cyrillic lowercase Er and U are changed to `cv76` and `cv78`.

View file

@ -36,17 +36,26 @@ async function GeneratePackageList(argv, out) {
const familyName = buildName("\u00a0", ...prime.family.split(" ")); const familyName = buildName("\u00a0", ...prime.family.split(" "));
const sTtcName = buildName("-", "SuperTTC", groupID, argv.version); const sTtcName = buildName("-", "SuperTTC", groupID, argv.version);
const ttcName = buildName("-", "PkgTTC", groupID, argv.version); const ttcName = buildName("-", "PkgTTC", groupID, argv.version);
const sTtcLink = `${DownloadLinkPrefix}/${sTtcName}.zip`;
const ttcLink = `${DownloadLinkPrefix}/${ttcName}.zip`;
const proportionPrefix = gr.quasiProportional ? "Quasi-proportional" : "Monospace"; const proportionPrefix = gr.quasiProportional ? "Quasi-proportional" : "Monospace";
const desc = `<i>${proportionPrefix}, ${prime.desc}</i>`; const desc = `<i>${proportionPrefix}, ${prime.desc}</i>`;
const img = ImgX(`${imagePrefix}/${groupID}`); const img = ImgX(`${imagePrefix}/${groupID}`);
let ttcCells = [`<td colspan="4">&nbsp;</td>`];
const hasSpacings = Object.entries(gr.subGroups).length > 1;
if (hasSpacings) {
const sTtcLink = `${DownloadLinkPrefix}/${sTtcName}.zip`;
const ttcLink = `${DownloadLinkPrefix}/${ttcName}.zip`;
ttcCells = [
`<td><b><a href="${sTtcLink}">Super\u00A0TTC</b></td>`,
`<td><b><a href="${ttcLink}">TTC</b></td>`,
`<td colspan="2">&nbsp;</td>`
];
}
out.log( out.log(
`<tr>`, `<tr>`,
`<td colspan="3"><b>&#x1F4E6; ${familyName}</b> — ${desc}</td>`, `<td colspan="3"><b>&#x1F4E6; ${familyName}</b> — ${desc}</td>`,
`<td><b><a href="${sTtcLink}">Super\u00A0TTC</b></td>`, ...ttcCells,
`<td><b><a href="${ttcLink}">TTC</b></td>`,
`<td colspan="2">&nbsp;</td>`,
`</tr>` `</tr>`
); );
out.log( out.log(
@ -69,13 +78,15 @@ async function GeneratePackageList(argv, out) {
return `<b><a href="${downloadLink}">${label}</a></b>`; return `<b><a href="${downloadLink}">${label}</a></b>`;
}; };
const leader = "&nbsp;&nbsp;&nbsp;&nbsp;" + (subGroupID === lastSubGroupID ? "└" : "├"); const leader = "&nbsp;&nbsp;&nbsp;&nbsp;" + (subGroupID === lastSubGroupID ? "└" : "├");
const superTtcPrefix = hasSpacings ? "SuperTTC-SGr" : "SuperTTC";
const ttcPrefix = hasSpacings ? "PkgTTC-SGr" : "PkgTTC";
out.log( out.log(
`<tr>`, `<tr>`,
`<td>${leader}&nbsp;<b>${noBreak(subGr.family)}</b></td>`, `<td>${leader}&nbsp;<b>${noBreak(subGr.family)}</b></td>`,
`<td>${spacingDesc}</td>`, `<td>${spacingDesc}</td>`,
`<td>${flag(ligation)}</td>`, `<td>${flag(ligation)}</td>`,
`<td>${createLink("Super\u00A0TTC", "SuperTTC-SGr")}</td>`, `<td>${createLink("Super\u00A0TTC", superTtcPrefix)}</td>`,
`<td>${createLink("TTC", "PkgTTC-SGr")}</td>`, `<td>${createLink("TTC", ttcPrefix)}</td>`,
`<td>${createLink("TTF", "PkgTTF")}&nbsp;` + `<td>${createLink("TTF", "PkgTTF")}&nbsp;` +
`(${createLink("Unhinted", "PkgTTF-Unhinted")})</td>`, `(${createLink("Unhinted", "PkgTTF-Unhinted")})</td>`,
`<td>${createLink("WebFont", "PkgWebFont")}&nbsp;` + `<td>${createLink("WebFont", "PkgWebFont")}&nbsp;` +

View file

@ -643,6 +643,7 @@ const CollectPlans = computed(`metadata:collect-plans`, async target => {
return await getCollectPlans(target, rawPlans.collectPlans); return await getCollectPlans(target, rawPlans.collectPlans);
}); });
// eslint-disable-next-line complexity
async function getCollectPlans(target, rawCollectPlans) { async function getCollectPlans(target, rawCollectPlans) {
const plans = {}; const plans = {};
@ -654,7 +655,10 @@ async function getCollectPlans(target, rawCollectPlans) {
} }
const amendedRawCollectPlans = { ...rawCollectPlans }; const amendedRawCollectPlans = { ...rawCollectPlans };
for (const gr of allCollectableGroups) { out: for (const gr of allCollectableGroups) {
for (const [k, cp] of Object.entries(rawCollectPlans)) {
if (cp.from.length === 1 && cp.from[0] === gr) continue out;
}
amendedRawCollectPlans[`SGr-` + gr] = { release: true, isAmended: true, from: [gr] }; amendedRawCollectPlans[`SGr-` + gr] = { release: true, isAmended: true, from: [gr] };
} }