[cantarell-fonts] Instantiator: always take features, groups, info and lib from default font
- From: Nikolaus Waxweiler <nwaxweiler src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cantarell-fonts] Instantiator: always take features, groups, info and lib from default font
- Date: Sat, 11 May 2019 17:09:08 +0000 (UTC)
commit ee0ca1b5d1a5fe5b0cebe14a00df2a4a6152877a
Author: Nikolaus Waxweiler <madigens gmail com>
Date: Sat May 11 18:07:59 2019 +0100
Instantiator: always take features, groups, info and lib from default font
scripts/instantiator.py | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/scripts/instantiator.py b/scripts/instantiator.py
index 8e4cbb91..323ec312 100644
--- a/scripts/instantiator.py
+++ b/scripts/instantiator.py
@@ -100,23 +100,10 @@ class Instantiator:
glyph_mutators[glyph_name] = mutator
# Construct defaults to copy over
- default_source = designspace.findDefault()
- copy_feature_text: str = next(
- (s.font.features.text for s in designspace.sources if s.copyFeatures),
- default_source.font.features.text,
- )
- copy_groups: Mapping[str, List[str]] = next(
- (s.font.groups for s in designspace.sources if s.copyGroups),
- default_source.font.groups,
- )
- copy_info: ufoLib2.objects.Info = next(
- (s.font.info for s in designspace.sources if s.copyInfo),
- default_source.font.info,
- )
- copy_lib: Mapping[str, Any] = next(
- (s.font.lib for s in designspace.sources if s.copyLib),
- default_source.font.lib,
- )
+ copy_feature_text: str = default_font.features.text
+ copy_groups: Mapping[str, List[str]] = default_font.groups
+ copy_info: ufoLib2.objects.Info = default_font.info
+ copy_lib: Mapping[str, Any] = default_font.lib
# The list of glyphs not to export and decompose where used as a component is
# supposed to be taken from the Designspace when a Designspace is used as the
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]