update vars

requirements.txt

@@ -1,3 +1,8 @@
-ruamel.yaml==0.16.12      # via yamlpath
-wheezy.template==3.0.3    # via -r requirements.in
-yamlpath==3.4.0           # via -r requirements.in
+ruamel.yaml.clib==0.2.2
+    # via ruamel.yaml
+ruamel.yaml==0.17.4
+    # via yamlpath
+wheezy.template==3.1.0
+    # via -r requirements.in
+yamlpath==3.5.0
+    # via -r requirements.in

vars.yml

@@ -34,9 +34,9 @@ charvars:
   capital-u: toothless-rounded
   capital-v: curly
   capital-w: curly
-  capital-x: curly
-  capital-y: curly
-  capital-z: with-crossbar
+  capital-x: curly-serifless
+  capital-y: curly-serifless
+  capital-z: straight-serifless-with-crossbar
   a: double-storey-tailed
   b: toothless-corner
   c: serifless
@@ -59,10 +59,11 @@ charvars:
   u: toothless-rounded
   v: curly
   w: cursive
-  x: curly
+  x: curly-serifless
   y: curly
-  z: with-crossbar
-  eszet: longs-s-lig
+  z: straight-serifless-with-crossbar
+  long-s: standard
+  eszet: longs-s-lig-tailed
   turn-v: curly
   lower-alpha: crossing
   capital-gamma: standard
@@ -80,10 +81,10 @@ charvars:
   five: oblique-upper-left-bar
   six: open-contour
   seven: curly-serifless
-  eight: crossing
+  eight: crossing-asymmetric
   nine: straight-bar
   tilde: low
-  asterisk: hex-high
+  asterisk: turn-hex-high
   underscore: high
   paragraph-sign: low
   caret: high