This commit is contained in:
be5invis 2016-03-07 21:56:40 +08:00
parent 2506f9a399
commit 9c7c70f81c
4 changed files with 30 additions and 19 deletions

View File

@ -68,26 +68,33 @@ archives-default : fonts-default
archives-slab : fonts-slab archives-slab : fonts-slab
@$(MAKE) -f onegroup.mk archives $(PARAM_SLAB) @$(MAKE) -f onegroup.mk archives $(PARAM_SLAB)
# Variant releases # Releases
releasepack-default : $(SCRIPTS) | $(OBJDIR) dist releasepack-default : $(SCRIPTS) | $(OBJDIR) dist
$(MAKE) pages-default pages-slab archives-default archives-slab VERSION=$(VERSION) $(MAKE) pages-default pages-slab archives-default archives-slab VERSION=$(VERSION) ARCPREFIX='a-'
fonts-fw : $(SCRIPTS) | $(OBJDIR) dist releasepack-nolig : $(SCRIPTS) | $(OBJDIR) dist
$(MAKE) fonts-default fonts-slab VERSION=$(VERSION) STYLE_COMMON='cjk' VARIANTNAME='wfw-' ARCPREFIX='withfw-' $(MAKE) pages-default pages-slab archives-default archives-slab VERSION=$(VERSION) VARIANTNAME='nolig-' STYLE_COMMON='nolig' NOLIG='true' ARCPREFIX='a-nolig-'
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-'
fonts-hooky : $(SCRIPTS) | $(OBJDIR) dist 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 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 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 releasepack-zshaped : fonts-zshaped
$(MAKE) archives-default VERSION=$(VERSION) VARIANTNAME='zshaped-' STYLE_UPRIGHT='v-l-zshaped v-i-zshaped' ARCPREFIX='variant-zshaped-' $(MAKE) archives-default VERSION=$(VERSION) VARIANTNAME='zshaped-' STYLE_UPRIGHT='v-l-zshaped v-i-zshaped' ARCPREFIX='b-variant-zshaped-'
release-all : releasepack-default releasepack-fw releasepack-cc releasepack-hooky releasepack-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 fw : fonts-fw fonts-cc
webfonts : webfonts-default webfonts-slab webfonts : webfonts-default webfonts-slab

View File

@ -159,9 +159,9 @@ $(WEBFONTCSS) : webfont-csses/$(ARCPREFIX)$(ARCPREFIXB).css
#$(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).tar.bz2 : $(DISTTARGETS) #$(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).tar.bz2 : $(DISTTARGETS)
# cd $(DISTDIR) && tar -cjvf ../$@ $(subst $(DISTDIR)/,,$^) # cd $(DISTDIR) && tar -cjvf ../$@ $(subst $(DISTDIR)/,,$^)
$(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).zip : $(DISTTARGETS) $(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) $(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).tar.bz2 $(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).zip
archives : $(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).zip $(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).7z archives : $(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).zip $(ARCHIVEDIR)/$(ARCPREFIX)$(ARCPREFIXB)-$(VERSION).7z

View File

@ -1,6 +1,6 @@
{ {
"name": "iosevka", "name": "iosevka",
"version": "1.8.1", "version": "1.8.2",
"main": "./generate.js", "main": "./generate.js",
"dependencies": { "dependencies": {
"patel": ">=0.29.0", "patel": ">=0.29.0",

View File

@ -1,6 +1,6 @@
[iosevka] [iosevka]
family = 'Iosevka' family = 'Iosevka'
version = '1.8.1' version = '1.8.2'
codename = 'Hermandine' codename = 'Hermandine'
copyright = 'Copyright (c) 2015-2016 Belleve Invis.' 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.''' 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] [cc.adds]
family = 'CC' family = 'CC'
[nolig]
[nolig.adds]
family = 'NL'
# Weights # Weights
[w-book] [w-book]