From 9c7c70f81c09b6b38e4a448addbbb10f093b28e7 Mon Sep 17 00:00:00 2001 From: be5invis Date: Mon, 7 Mar 2016 21:56:40 +0800 Subject: [PATCH] r1.8.2 --- makefile | 37 ++++++++++++++++++++++--------------- onegroup.mk | 4 ++-- package.json | 2 +- parameters.toml | 6 +++++- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/makefile b/makefile index d087407..5c1d275 100644 --- a/makefile +++ b/makefile @@ -68,26 +68,33 @@ archives-default : fonts-default archives-slab : fonts-slab @$(MAKE) -f onegroup.mk archives $(PARAM_SLAB) -# Variant releases +# Releases releasepack-default : $(SCRIPTS) | $(OBJDIR) dist - $(MAKE) pages-default pages-slab archives-default archives-slab VERSION=$(VERSION) -fonts-fw : $(SCRIPTS) | $(OBJDIR) dist - $(MAKE) fonts-default fonts-slab VERSION=$(VERSION) STYLE_COMMON='cjk' VARIANTNAME='wfw-' ARCPREFIX='withfw-' -fonts-cc : $(SCRIPTS) | $(OBJDIR) dist - $(MAKE) fonts-default fonts-slab VERSION=$(VERSION) STYLE_COMMON='cjk cc' VARIANTNAME='wcc-' ARCPREFIX='withfw-cc-' -releasepack-fw : fonts-fw - $(MAKE) archives-default archives-slab VERSION=$(VERSION) STYLE_COMMON='cjk' VARIANTNAME='wfw-' ARCPREFIX='withfw-' -releasepack-cc : fonts-cc - $(MAKE) archives-default archives-slab VERSION=$(VERSION) STYLE_COMMON='cjk cc' VARIANTNAME='wcc-' ARCPREFIX='withfw-cc-' + $(MAKE) pages-default pages-slab archives-default archives-slab VERSION=$(VERSION) ARCPREFIX='a-' +releasepack-nolig : $(SCRIPTS) | $(OBJDIR) dist + $(MAKE) pages-default pages-slab archives-default archives-slab VERSION=$(VERSION) VARIANTNAME='nolig-' STYLE_COMMON='nolig' NOLIG='true' ARCPREFIX='a-nolig-' fonts-hooky : $(SCRIPTS) | $(OBJDIR) dist - $(MAKE) fonts-default VERSION=$(VERSION) VARIANTNAME='hooky-' STYLE_UPRIGHT='v-l-hooky v-i-hooky' ARCPREFIX='variant-hooky-' + $(MAKE) fonts-default VERSION=$(VERSION) VARIANTNAME='hooky-' STYLE_UPRIGHT='v-l-hooky v-i-hooky' ARCPREFIX='b-variant-hooky-' fonts-zshaped : $(SCRIPTS) | $(OBJDIR) dist - $(MAKE) fonts-default VERSION=$(VERSION) VARIANTNAME='zshaped-' STYLE_UPRIGHT='v-l-zshaped v-i-zshaped' ARCPREFIX='variant-zshaped-' + $(MAKE) fonts-default VERSION=$(VERSION) VARIANTNAME='zshaped-' STYLE_UPRIGHT='v-l-zshaped v-i-zshaped' ARCPREFIX='b-variant-zshaped-' releasepack-hooky : fonts-hooky - $(MAKE) archives-default VERSION=$(VERSION) VARIANTNAME='hooky-' STYLE_UPRIGHT='v-l-hooky v-i-hooky' ARCPREFIX='variant-hooky-' + $(MAKE) archives-default VERSION=$(VERSION) VARIANTNAME='hooky-' STYLE_UPRIGHT='v-l-hooky v-i-hooky' ARCPREFIX='b-variant-hooky-' releasepack-zshaped : fonts-zshaped - $(MAKE) archives-default VERSION=$(VERSION) VARIANTNAME='zshaped-' STYLE_UPRIGHT='v-l-zshaped v-i-zshaped' ARCPREFIX='variant-zshaped-' -release-all : releasepack-default releasepack-fw releasepack-cc releasepack-hooky releasepack-zshaped + $(MAKE) archives-default VERSION=$(VERSION) VARIANTNAME='zshaped-' STYLE_UPRIGHT='v-l-zshaped v-i-zshaped' ARCPREFIX='b-variant-zshaped-' +releasepack-hooky-nolig : fonts-hooky + $(MAKE) archives-default VERSION=$(VERSION) VARIANTNAME='hooky-nolig-' STYLE_COMMON='nolig' STYLE_UPRIGHT='v-l-hooky v-i-hooky' ARCPREFIX='b-variant-hooky-nolig-' +releasepack-zshaped-nolig : fonts-zshaped + $(MAKE) archives-default VERSION=$(VERSION) VARIANTNAME='zshaped-nolig-' STYLE_COMMON='nolig' STYLE_UPRIGHT='v-l-zshaped v-i-zshaped' ARCPREFIX='b-variant-zshaped-nolig-' +fonts-fw : $(SCRIPTS) | $(OBJDIR) dist + $(MAKE) fonts-default fonts-slab VERSION=$(VERSION) STYLE_COMMON='cjk' VARIANTNAME='wfw-' ARCPREFIX='c-withfw-' +fonts-cc : $(SCRIPTS) | $(OBJDIR) dist + $(MAKE) fonts-default fonts-slab VERSION=$(VERSION) STYLE_COMMON='cjk cc' VARIANTNAME='wcc-' ARCPREFIX='c-withfw-cc-' +releasepack-fw : fonts-fw + $(MAKE) archives-default archives-slab VERSION=$(VERSION) STYLE_COMMON='cjk' VARIANTNAME='wfw-' ARCPREFIX='c-withfw-' +releasepack-cc : fonts-cc + $(MAKE) archives-default archives-slab VERSION=$(VERSION) STYLE_COMMON='cjk cc' VARIANTNAME='wcc-' ARCPREFIX='c-withfw-cc-' + +release-all : releasepack-default releasepack-nolig releasepack-hooky releasepack-zshaped releasepack-hooky-nolig releasepack-zshaped-nolig releasepack-fw releasepack-cc fw : fonts-fw fonts-cc webfonts : webfonts-default webfonts-slab diff --git a/onegroup.mk b/onegroup.mk index 4807d26..ea0a8be 100644 --- a/onegroup.mk +++ b/onegroup.mk @@ -159,9 +159,9 @@ $(WEBFONTCSS) : webfont-csses/$(ARCPREFIX)$(ARCPREFIXB).css #$(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).tar.bz2 : $(DISTTARGETS) # cd $(DISTDIR) && tar -cjvf ../$@ $(subst $(DISTDIR)/,,$^) $(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).zip : $(DISTTARGETS) - cd dist && 7z a -tzip -mx=9 ../$@ $(subst dist/,,$(DISTDIR)) + cd $(DISTDIR) && 7z a -tzip -mx=9 ../../$@ ./*.ttf $(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).7z : $(DISTTARGETS) - cd dist && 7z a -t7z -mx=9 ../$@ $(subst dist/,,$(DISTDIR)) + cd $(DISTDIR) && 7z a -t7z -mmt=on -m0=LZMA:a=1:d=1536m:fb=256 ../../$@ ./*.ttf #archives : $(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).tar.bz2 $(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).zip archives : $(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).zip $(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).7z diff --git a/package.json b/package.json index a1c861b..2b145f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iosevka", - "version": "1.8.1", + "version": "1.8.2", "main": "./generate.js", "dependencies": { "patel": ">=0.29.0", diff --git a/parameters.toml b/parameters.toml index 7fb6d6b..c127215 100644 --- a/parameters.toml +++ b/parameters.toml @@ -1,6 +1,6 @@ [iosevka] family = 'Iosevka' -version = '1.8.1' +version = '1.8.2' codename = 'Hermandine' copyright = 'Copyright (c) 2015-2016 Belleve Invis.' licence = '''This font software is licenced under the SIL Open Font Licence, Version 1.1. This is licence is avaliable with a FAQ at: http://scripts.sil.org/OFL. This font software is distributes on an 'AS IS' basis, without warranties or conditions of any kind, either express or implied. See the SIL Open Font licence fot the specific language, premissions and limitations governing your use of this font software.''' @@ -371,6 +371,10 @@ fullwidth_codes = [ [cc.adds] family = 'CC' +[nolig] +[nolig.adds] +family = 'NL' + # Weights [w-book]