mikeslab/Iosevka
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Fix incorrect style selector override.

Browse source
This commit is contained in:
Belleve Invis 2020-01-13 22:52:06 -08:00
parent 799c5027e7
commit aac909ffe9
2 changed files with 71 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gen/generator.js
View file

@ -42,7 +42,7 @@ function getParameters(argv) {
const para = parameters.build(parametersData, argv._); const para = parameters.build(parametersData, argv._);
const variantsData = formVariantData(variantData, para); const variantsData = formVariantData(variantData, para);
para.variants = variantsData; para.variants = variantsData;
para.variantSelector = parameters.build(variantsData, argv._); para.variantSelector = parameters.build(variantsData, ["default", ...argv._]);
para.defaultVariant = variantsData.default; para.defaultVariant = variantsData.default;
para.naming = { para.naming = {

11
support/variant-data.js
View file

@ -8,8 +8,8 @@ function mergeVSHive(_target, source) {
return target; return target;
} }
function produceComposite(vs, para, dflt, g) { function produceComposite(vs, para, g) {
let sel = objectAssign({}, dflt); let sel = {};
if (g.design) if (g.design)
for (let h of g.design) { for (let h of g.design) {
sel = mergeVSHive(sel, vs[h]); sel = mergeVSHive(sel, vs[h]);
@ -62,10 +62,9 @@ module.exports = function formVariantData(data, para) {
} }
} }
// default selector // default selector
vs.default = produceComposite(vs, para, {}, data.default); vs.default = produceComposite(vs, para, data.default);
// ss## selector // ss## selector
for (let k in data.composite) { for (let k in data.composite) vs[k] = produceComposite(vs, para, data.composite[k]);
vs[k] = produceComposite(vs, para, vs.default, data.composite[k]);
}
return vs; return vs;
}; };