Merge branch 'releases'

This commit is contained in:
be5invis 2016-03-16 23:51:07 +08:00
commit 61b0d47ffc
6 changed files with 55 additions and 40 deletions

View File

@ -96,13 +96,11 @@ The current avaliable styles are:
## Release Notes ## Release Notes
* **1.8.3**
- Added Kome symbol (`※`).
- Reorganized pre-built release packages. The “IosevkaNL” is renamed to “Iosevka Term”.
* **1.8.2** * **1.8.2**
- Iosevka now provides a new variant family “IosevkaNL”, with ligation disabled to avoid typesetting issues under some Linux environments. The current ligation set is: - Iosevka now provides a new variant family “IosevkaNL”, with ligation disabled to avoid typesetting issues under some Linux environments.
```
>>- <-< <<- <-- <- >- <-> -< -> --> ->> >-> -<< <--> <!-- -->
>>= <=< <<= <== <=> =< => ==> =>> >=> =<< <==>
```
* **1.8.1** * **1.8.1**
- Added more ligations. - Added more ligations.
- Fixed the incorrectly-sized symbol `∞` in the CC variants. - Fixed the incorrectly-sized symbol `∞` in the CC variants.

View File

@ -288,8 +288,12 @@ export as build : define [buildFont para recursive recursiveCodes] : begin
define ONEBALANCE : fallback para.onebalance 0 define ONEBALANCE : fallback para.onebalance 0
# derived metrics # derived metrics
define FULLWIDTH : if (para.spacing >= 2) 1000 WIDTH
define FULLWIDTH1 : if (para.spacing >= 1) 1000 WIDTH
define FULLWIDTH2 : if (para.spacing >= 2) 1000 WIDTH
define FULLWIDTH3 : if (para.spacing >= 3) 1000 WIDTH
define OXE : OX - O define OXE : OX - O
define FULLWIDTH : if (para.spacing == 2) 1000 WIDTH
define ESS : STROKE * [fallback para.essx CONTRAST] define ESS : STROKE * [fallback para.essx CONTRAST]
define ESSQUESTION : STROKE * [fallback para.essxq CONTRAST] define ESSQUESTION : STROKE * [fallback para.essxq CONTRAST]
define XO : XH - O define XO : XH - O

View File

@ -433,17 +433,17 @@ symbol-block 'Circled and Braced' : if [not recursive] : begin
list 0xA9 'C' list 0xA9 'C'
list 0xAE 'R' list 0xAE 'R'
list 0x2117 'P' list 0x2117 'P'
list 0x24EA 'zero' FULLWIDTH list 0x24EA 'zero' FULLWIDTH1
list null 'space' FULLWIDTH list null 'space' FULLWIDTH1
foreach [j : range 1 till 9] : compositions.push {(0x2460 + j - 1) unicodeGlyphs.(['0'.charCodeAt 0] + j).name FULLWIDTH} foreach [j : range 1 till 9] : compositions.push {(0x2460 + j - 1) unicodeGlyphs.(['0'.charCodeAt 0] + j).name FULLWIDTH1}
foreach [j : range 0 26] : compositions.push {(0x24B6 + j) unicodeGlyphs.(['A'.charCodeAt 0] + j).name FULLWIDTH} foreach [j : range 0 26] : compositions.push {(0x24B6 + j) unicodeGlyphs.(['A'.charCodeAt 0] + j).name FULLWIDTH1}
foreach [j : range 0 26] : compositions.push {(0x24D0 + j) unicodeGlyphs.(['a'.charCodeAt 0] + j).name FULLWIDTH} foreach [j : range 0 26] : compositions.push {(0x24D0 + j) unicodeGlyphs.(['a'.charCodeAt 0] + j).name FULLWIDTH1}
createCircledGlyphs compositions createCircledGlyphs compositions
local compositions : list local compositions : list
list null 'space' FULLWIDTH list null 'space' FULLWIDTH1
foreach [j : range 1 till 9] : compositions.push {(0x2474 + j - 1) unicodeGlyphs.(['0'.charCodeAt 0] + j).name FULLWIDTH} foreach [j : range 1 till 9] : compositions.push {(0x2474 + j - 1) unicodeGlyphs.(['0'.charCodeAt 0] + j).name FULLWIDTH1}
foreach [j : range 0 26] : compositions.push {(0x249C + j) unicodeGlyphs.(['a'.charCodeAt 0] + j).name FULLWIDTH} foreach [j : range 0 26] : compositions.push {(0x249C + j) unicodeGlyphs.(['a'.charCodeAt 0] + j).name FULLWIDTH1}
createBracedGlyphs compositions createBracedGlyphs compositions
createSMCPs : list createSMCPs : list

View File

@ -579,12 +579,12 @@ symbol-block 'Powerline'
sketch # pwlUnderline sketch # pwlUnderline
local fine : adviceBlackness 4 local fine : adviceBlackness 4
include : HBarBottom 0 WIDTH (-font.'OS/2'.usWinDescent) include : HBarBottom 0 WIDTH (-font.'OS/2'.usWinDescent)
save 'pwlUnderline' 0xE0BE save 'pwlUnderline' 0xE0AE
sketch # pwlOverline sketch # pwlOverline
local fine : adviceBlackness 4 local fine : adviceBlackness 4
include : HBarTop 0 WIDTH font.'OS/2'.usWinAscent include : HBarTop 0 WIDTH font.'OS/2'.usWinAscent
save 'pwlOverline' 0xE0BF save 'pwlOverline' 0xE0AF
sketch # pwlLock sketch # pwlLock
local fine : adviceBlackness 3.5 local fine : adviceBlackness 3.5

View File

@ -1,5 +1,7 @@
default: fonts default: fonts
ARCPREFIX=$(if $(ARCPREFIX1),$(ARCPREFIX1),01.)
include makesupport.mk include makesupport.mk
PARAM_DEFAULT = FAST='$(FAST)' SUFFIX='$(SUFFIX)' VARNAME='$(VARNAME)' STYLE_COMMON='$(STYLE_COMMON)' STYLE_UPRIGHT='$(STYLE_UPRIGHT)' STYLE_ITALIC='$(STYLE_ITALIC)' VERSION='$(VERSION)' ARCPREFIX='$(ARCPREFIX)' NOLIG='$(NOLIG)' NOCHARMAP='$(NOCHARMAP)' PARAM_DEFAULT = FAST='$(FAST)' SUFFIX='$(SUFFIX)' VARNAME='$(VARNAME)' STYLE_COMMON='$(STYLE_COMMON)' STYLE_UPRIGHT='$(STYLE_UPRIGHT)' STYLE_ITALIC='$(STYLE_ITALIC)' VERSION='$(VERSION)' ARCPREFIX='$(ARCPREFIX)' NOLIG='$(NOLIG)' NOCHARMAP='$(NOCHARMAP)'
PARAM_SLAB = FAST='$(FAST)' SUFFIX='$(SUFFIX)-slab' VARNAME='$(VARNAME)' STYLE_COMMON='$(STYLE_COMMON)' STYLE_SUFFIX='slab' STYLE_UPRIGHT='$(STYLE_UPRIGHT)' STYLE_ITALIC='$(STYLE_ITALIC)' VERSION='$(VERSION)' ARCPREFIX='$(ARCPREFIX)' NOLIG='$(NOLIG)' NOCHARMAP='$(NOCHARMAP)' PARAM_SLAB = FAST='$(FAST)' SUFFIX='$(SUFFIX)-slab' VARNAME='$(VARNAME)' STYLE_COMMON='$(STYLE_COMMON)' STYLE_SUFFIX='slab' STYLE_UPRIGHT='$(STYLE_UPRIGHT)' STYLE_ITALIC='$(STYLE_ITALIC)' VERSION='$(VERSION)' ARCPREFIX='$(ARCPREFIX)' NOLIG='$(NOLIG)' NOCHARMAP='$(NOCHARMAP)'
@ -70,31 +72,44 @@ archives-slab : fonts-slab
# 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 archives-default VERSION=$(VERSION) \
ARCPREFIX='std-' ARCPREFIX1='01.'
releasepack-nl : $(SCRIPTS) | $(OBJDIR) dist releasepack-term : $(SCRIPTS) | $(OBJDIR) dist
$(MAKE) archives-default archives-slab VERSION=$(VERSION) \ $(MAKE) archives-default VERSION=$(VERSION) \
ARCPREFIX='std-nl-' VARNAME='nl-' STYLE_COMMON='nl' NOCHARMAP='true' ARCPREFIX1='02.' SUFFIX='-term' STYLE_COMMON='term' NOCHARMAP='true'
releasepack-wcc : $(SCRIPTS) | $(OBJDIR) dist releasepack-cc : $(SCRIPTS) | $(OBJDIR) dist
$(MAKE) archives-default archives-slab VERSION=$(VERSION) \ $(MAKE) archives-default VERSION=$(VERSION) \
ARCPREFIX='std-wcc-' VARNAME='wcc-' STYLE_COMMON='cc' NOCHARMAP='true' ARCPREFIX1='03.' SUFFIX='-cc' STYLE_COMMON='cc' NOCHARMAP='true'
releasepack-slab : $(SCRIPTS) | $(OBJDIR) dist
$(MAKE) pages-slab archives-slab VERSION=$(VERSION) \
ARCPREFIX1='04.'
releasepack-term-slab : $(SCRIPTS) | $(OBJDIR) dist
$(MAKE) archives-slab VERSION=$(VERSION) \
ARCPREFIX1='05.' SUFFIX='-term' STYLE_COMMON='term' NOCHARMAP='true'
releasepack-cc-slab : $(SCRIPTS) | $(OBJDIR) dist
$(MAKE) archives-slab VERSION=$(VERSION) \
ARCPREFIX1='06.' SUFFIX='-cc' STYLE_COMMON='cc' NOCHARMAP='true'
releasepack-hooky : $(SCRIPTS) | $(OBJDIR) dist releasepack-hooky : $(SCRIPTS) | $(OBJDIR) dist
$(MAKE) archives-default VERSION=$(VERSION) \ $(MAKE) archives-default VERSION=$(VERSION) \
ARCPREFIX='var-hooky-' VARNAME='hooky-' STYLE_UPRIGHT='v-l-hooky v-i-hooky' NOCHARMAP='true' ARCPREFIX1='07.' SUFFIX='-hooky' STYLE_UPRIGHT='v-l-hooky v-i-hooky' NOCHARMAP='true'
releasepack-hooky-nl : $(SCRIPTS) | $(OBJDIR) dist releasepack-hooky-term : $(SCRIPTS) | $(OBJDIR) dist
$(MAKE) archives-default VERSION=$(VERSION) \ $(MAKE) archives-default VERSION=$(VERSION) \
ARCPREFIX='var-hooky-nl-' VARNAME='hooky-nl-' STYLE_COMMON='nl' STYLE_UPRIGHT='v-l-hooky v-i-hooky' NOCHARMAP='true' ARCPREFIX1='08.' SUFFIX='-term-hooky' STYLE_COMMON='term' STYLE_UPRIGHT='v-l-hooky v-i-hooky' NOCHARMAP='true'
releasepack-zshaped : $(SCRIPTS) | $(OBJDIR) dist releasepack-zshaped : $(SCRIPTS) | $(OBJDIR) dist
$(MAKE) archives-default VERSION=$(VERSION) \ $(MAKE) archives-default VERSION=$(VERSION) \
ARCPREFIX='var-zshaped-' VARNAME='zshaped-' STYLE_UPRIGHT='v-l-zshaped v-i-zshaped' NOCHARMAP='true' ARCPREFIX1='09.' SUFFIX='-zshaped' STYLE_UPRIGHT='v-l-zshaped v-i-zshaped' NOCHARMAP='true'
releasepack-zshaped-nl : $(SCRIPTS) | $(OBJDIR) dist releasepack-zshaped-term : $(SCRIPTS) | $(OBJDIR) dist
$(MAKE) archives-default VERSION=$(VERSION) \ $(MAKE) archives-default VERSION=$(VERSION) \
ARCPREFIX='var-zshaped-nl-' VARNAME='zshaped-nl-' STYLE_COMMON='nl' STYLE_UPRIGHT='v-l-zshaped v-i-zshaped' NOCHARMAP='true' ARCPREFIX1='10.' SUFFIX='-term-zshaped' STYLE_COMMON='term' STYLE_UPRIGHT='v-l-zshaped v-i-zshaped' NOCHARMAP='true'
release-all : releasepack-default releasepack-nl releasepack-wcc releasepack-hooky releasepack-zshaped releasepack-hooky-nl releasepack-zshaped-nl release-all : releasepack-default releasepack-term releasepack-cc \
fw : releasepack-default releasepack-wcc releasepack-slab releasepack-term-slab releasepack-cc-slab \
releasepack-hooky releasepack-zshaped \
releasepack-hooky-term releasepack-zshaped-term
fw : releasepack-default releasepack-cc releasepack-slab releasepack-cc-slab
webfonts : webfonts-default webfonts-slab webfonts : webfonts-default webfonts-slab

View File

@ -61,9 +61,7 @@ isItalic = false # Use italic shapes?
lllcrowdedness = 3.33333333 lllcrowdedness = 3.33333333
spacing = 1 spacing = 1 # Spacing indicator
[iosevka.variantSelector] [iosevka.variantSelector]
@ -84,15 +82,15 @@ verbose = true
# Spacings # Spacings
[nl] [term]
spacing = 0 spacing = 0
disableLigation = true disableLigation = true
[nl.adds] [term.adds]
family = 'NL' family = ' Term'
[cc] [cc]
spacing = 2 spacing = 3
fullwidth_codes = [ fullwidth_codes = [
164, 164,
167, 167,