From 1b65b390d3700e9c22945df8a7da20a69c2290d6 Mon Sep 17 00:00:00 2001
From: be5invis <belleve@typeof.net>
Date: Thu, 5 Nov 2015 03:05:35 +0800
Subject: [PATCH] renamed parameter `vexpansion` to `contrast`. ver 1.0-beta3.

---
 buildglyphs.patel         | 19 ++++++-------------
 glyphs/symbol-ascii.patel |  2 +-
 parameters.toml           |  6 +++---
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/buildglyphs.patel b/buildglyphs.patel
index 6a2b5af..447895d 100644
--- a/buildglyphs.patel
+++ b/buildglyphs.patel
@@ -73,7 +73,7 @@ define [buildFont para recursive] : begin
 	
 	define globalTransform : Italify para.italicAngle
 	define deGlobalTransform : inverse globalTransform
-	define CORRECTION_HX : [fallback para.vexpansion 1] / [Math.sqrt (1 - globalTransform.yx * globalTransform.yx)]
+	define CORRECTION_HX : [fallback para.contrast 1] / [Math.sqrt (1 - globalTransform.yx * globalTransform.yx)]
 	
 	# Orient parameters
 	define UPWARD {.x (-CORRECTION_HX) .y 0}
@@ -97,7 +97,7 @@ define [buildFont para recursive] : begin
 	define SMOOTH para.smooth
 	define SMALLSMOOTH para.smallsmooth
 	define STROKE para.stroke
-	define VEXPANSION para.vexpansion
+	define CONTRAST para.contrast
 	define DOTSIZE : fallback para.dotsize STROKE
 	define PERIODSIZE : fallback para.periodsize DOTSIZE
 	define BARPOS : fallback para.barpos 0.5
@@ -134,8 +134,8 @@ define [buildFont para recursive] : begin
 	
 	# derived metrics
 	define FULLWIDTH : if para.cjkSpacing (WIDTH * 2) WIDTH
-	define VSTROKE : STROKE * VEXPANSION
-	define ESS : STROKE * [fallback para.essx VEXPANSION]
+	define VSTROKE : STROKE * CONTRAST
+	define ESS : STROKE * [fallback para.essx CONTRAST]
 	define XO : XH - O
 	define CAPO : CAP - O
 	define HALFSTROKE : STROKE / 2
@@ -386,14 +386,7 @@ define [buildFont para recursive] : begin
 			set knots.(j) : knots.(j).af.call s knots.(j - 1) knots.(j + 1) knots.(j)
 		if closed : knots.pop
 		return {.knots [flatten knots] .closed closed .lastafs lastafs}
-	define [spiro-stroke] : begin
-		local s : new Stroke
-		s.set-transform globalTransform
-		s.set-samples 1
-		local {.knots knots .closed closed .lastafs lastafs} : prepareSpiroKnots [{}.slice.call arguments 0] s
-		libspiro.spiroToBezierOnContext knots closed s
-		foreach af [items-of lastafs] : if af : af.call s
-		return s
+
 	define [spiro] : begin
 		local s : new SpiroExpansionContext
 		set s.gizmo globalTransform
@@ -404,7 +397,7 @@ define [buildFont para recursive] : begin
 				if af : af.apply this arguments
 		libspiro.spiroToBezierOnContext knots closed s
 		foreach af [items-of lastafs] : if af : af.call s
-		local {.lhs lhs .rhs rhs} : s.expand VEXPANSION
+		local {.lhs lhs .rhs rhs} : s.expand CONTRAST
 		if closed
 			then
 				local g : new Glyph
diff --git a/glyphs/symbol-ascii.patel b/glyphs/symbol-ascii.patel
index 2cfced7..5af994e 100644
--- a/glyphs/symbol-ascii.patel
+++ b/glyphs/symbol-ascii.patel
@@ -23,7 +23,7 @@ create-glyph 'ampersand' : glyph-construction
 	local fine : adviceBlackness 3.5
 	local p 0.85
 	local l 0.05
-	local pr 0.9
+	local pr 0.85
 	local q 0.45
 	local r 1.1
 	local s 0
diff --git a/parameters.toml b/parameters.toml
index b656344..0e94867 100644
--- a/parameters.toml
+++ b/parameters.toml
@@ -1,7 +1,7 @@
 [iosevka]
 family = 'Iosevka'
-version = '1.0-beta2'
-codename = 'Tsuyuri'
+version = '1.0-beta3'
+codename = 'Agui'
 copyright = 'Copyright (c) 2015 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.'''
 
@@ -54,7 +54,7 @@ onebalance = 30
 isBold = false
 isItalic = false
 
-vexpansion = 1.11111111111
+contrast = 1.11111
 
 [iosevka.variantSelector]