[cantarell-fonts/respace-tighter-caps] Higher caps



commit 42de4a9b5d274c39d474f8c17296dfa16bffaecf
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Mon May 20 22:30:38 2019 +0100

    Higher caps

 src/Cantarell-Regular.ufo/glyphs/A_-cy.glif        |  2 +-
 src/Cantarell-Regular.ufo/glyphs/A_.glif           | 32 ++++----
 src/Cantarell-Regular.ufo/glyphs/A_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif |  4 +-
 .../glyphs/A_brevedotbelow.glif                    |  6 +-
 src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif |  4 +-
 .../glyphs/A_brevehookabove.glif                   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif |  4 +-
 .../glyphs/A_circumflexacute.glif                  |  4 +-
 .../glyphs/A_circumflexdotbelow.glif               |  6 +-
 .../glyphs/A_circumflexgrave.glif                  |  4 +-
 .../glyphs/A_circumflexhookabove.glif              |  4 +-
 .../glyphs/A_circumflextilde.glif                  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif   |  4 +-
 .../glyphs/A_dieresis-cy.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif  |  4 +-
 .../glyphs/A_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_macron.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_ring.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/B_.glif           | 74 +++++++++---------
 src/Cantarell-Regular.ufo/glyphs/C_.glif           | 58 +++++++-------
 src/Cantarell-Regular.ufo/glyphs/C_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/C_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif    |  4 +-
 .../glyphs/C_cedillaacute.glif                     |  6 +-
 src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/D_.glif           | 44 +++++------
 src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/D_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/D_croat.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_.glif           | 42 +++++-----
 src/Cantarell-Regular.ufo/glyphs/E_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_caron.glif      |  4 +-
 .../glyphs/E_cedillabreve.glif                     |  6 +-
 src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif |  4 +-
 .../glyphs/E_circumflexacute.glif                  |  4 +-
 .../glyphs/E_circumflexdotbelow.glif               |  6 +-
 .../glyphs/E_circumflexgrave.glif                  |  4 +-
 .../glyphs/E_circumflexhookabove.glif              |  4 +-
 .../glyphs/E_circumflextilde.glif                  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif  |  4 +-
 .../glyphs/E_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_macron.glif     |  4 +-
 .../glyphs/E_macronacute.glif                      |  6 +-
 .../glyphs/E_macrongrave.glif                      |  6 +-
 src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif       |  2 +-
 .../glyphs/E_sdescender-cy.glif                    |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_th.glif         |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/F_.glif           | 30 ++++----
 src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif     |  2 +-
 src/Cantarell-Regular.ufo/glyphs/G_.glif           | 68 ++++++++--------
 src/Cantarell-Regular.ufo/glyphs/G_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/G_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif |  4 +-
 .../glyphs/G_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/G_macron.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/H_.glif           | 34 ++++----
 src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/H_bar.glif        |  4 +-
 src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_-cy.glif        |  2 +-
 src/Cantarell-Regular.ufo/glyphs/I_.glif           | 18 ++---
 src/Cantarell-Regular.ufo/glyphs/I_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif   |  4 +-
 .../glyphs/I_dieresisacute.glif                    |  6 +-
 src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/I_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif  |  4 +-
 .../glyphs/I_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_macron.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/J_.glif           | 38 ++++-----
 src/Cantarell-Regular.ufo/glyphs/J_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/K_.glif           | 28 +++----
 src/Cantarell-Regular.ufo/glyphs/K_acute.glif      |  4 +-
 .../glyphs/K_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_.glif           | 24 +++---
 src/Cantarell-Regular.ufo/glyphs/L_J_.glif         |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_caron.glif      |  4 +-
 .../glyphs/L_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_dot.glif        |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_j.glif          |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_slash.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/M_.glif           | 38 ++++-----
 src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_.glif           | 30 ++++----
 src/Cantarell-Regular.ufo/glyphs/N_J_.glif         |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_caron.glif      |  4 +-
 .../glyphs/N_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_j.glif          |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_-cy.glif        |  2 +-
 src/Cantarell-Regular.ufo/glyphs/O_.glif           | 64 +++++++--------
 src/Cantarell-Regular.ufo/glyphs/O_E_.glif         | 90 +++++++++++-----------
 src/Cantarell-Regular.ufo/glyphs/O_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif |  4 +-
 .../glyphs/O_circumflexacute.glif                  |  4 +-
 .../glyphs/O_circumflexdotbelow.glif               |  6 +-
 .../glyphs/O_circumflexgrave.glif                  |  4 +-
 .../glyphs/O_circumflexhookabove.glif              |  4 +-
 .../glyphs/O_circumflextilde.glif                  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif   |  4 +-
 .../glyphs/O_dieresis-cy.glif                      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif   |  4 +-
 .../glyphs/O_dieresismacron.glif                   |  6 +-
 .../glyphs/O_dotaccentmacron.glif                  |  6 +-
 src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_horn.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif  |  4 +-
 .../glyphs/O_horndotbelow.glif                     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif  |  4 +-
 .../glyphs/O_hornhookabove.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif  |  4 +-
 .../glyphs/O_hungarumlaut.glif                     |  4 +-
 .../glyphs/O_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_macron.glif     |  4 +-
 .../glyphs/O_macronacute.glif                      |  6 +-
 .../glyphs/O_macrongrave.glif                      |  6 +-
 src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_slash.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif |  6 +-
 .../glyphs/O_tildedieresis.glif                    |  6 +-
 .../glyphs/O_tildemacron.glif                      |  6 +-
 src/Cantarell-Regular.ufo/glyphs/P_.glif           | 50 ++++++------
 src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif |  2 +-
 src/Cantarell-Regular.ufo/glyphs/Q_.glif           | 62 +++++++--------
 src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/R_.glif           | 58 +++++++-------
 src/Cantarell-Regular.ufo/glyphs/R_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/R_caron.glif      |  4 +-
 .../glyphs/R_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif   |  4 +-
 .../glyphs/R_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/S_.glif           | 70 ++++++++---------
 src/Cantarell-Regular.ufo/glyphs/S_acute.glif      |  4 +-
 .../glyphs/S_acutedotaccent.glif                   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/S_caron.glif      |  4 +-
 .../glyphs/S_carondotaccent.glif                   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif |  4 +-
 .../glyphs/S_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif   |  4 +-
 .../glyphs/S_dotbelowdotaccent.glif                |  6 +-
 src/Cantarell-Regular.ufo/glyphs/T_horn.glif       | 46 +++++------
 src/Cantarell-Regular.ufo/glyphs/U_.glif           | 46 +++++------
 src/Cantarell-Regular.ufo/glyphs/U_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif   |  4 +-
 .../glyphs/U_dieresisacute.glif                    |  6 +-
 .../glyphs/U_dieresiscaron.glif                    |  6 +-
 .../glyphs/U_dieresisgrave.glif                    |  6 +-
 .../glyphs/U_dieresismacron.glif                   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_horn.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif  |  4 +-
 .../glyphs/U_horndotbelow.glif                     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif  |  4 +-
 .../glyphs/U_hornhookabove.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif  |  4 +-
 .../glyphs/U_hungarumlaut.glif                     |  4 +-
 .../glyphs/U_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_macron.glif     |  4 +-
 .../glyphs/U_macrondieresis.glif                   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_ring.glif       |  4 +-
 .../glyphs/U_straight-cy.glif                      |  2 +-
 .../glyphs/U_straightstroke-cy.glif                |  2 +-
 src/Cantarell-Regular.ufo/glyphs/U_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif |  6 +-
 src/Cantarell-Regular.ufo/glyphs/V_.glif           | 22 +++---
 src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/W_.glif           | 38 ++++-----
 src/Cantarell-Regular.ufo/glyphs/W_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/W_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/X_.glif           | 34 ++++----
 src/Cantarell-Regular.ufo/glyphs/Y_.glif           | 28 +++----
 src/Cantarell-Regular.ufo/glyphs/Y_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_macron.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_.glif           | 30 ++++----
 src/Cantarell-Regular.ufo/glyphs/Z_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif  |  2 +-
 src/Cantarell_autospace.py                         |  2 +-
 259 files changed, 1061 insertions(+), 1061 deletions(-)
---
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
index 4b89ef7c..bd953ab3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A-cy" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="0410"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_.glif b/src/Cantarell-Regular.ufo/glyphs/A_.glif
index 7021f90f..e8c443da 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="0041"/>
   <note>
 A
 </note>
-  <anchor x="322" y="0" name="bottom"/>
-  <anchor x="605" y="10" name="ogonek"/>
-  <anchor x="322" y="694" name="top"/>
+  <anchor x="327" y="0" name="bottom"/>
+  <anchor x="610" y="10" name="ogonek"/>
+  <anchor x="327" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="15" y="0" type="line"/>
-      <point x="102" y="0" type="line"/>
-      <point x="329" y="636" type="line"/>
-      <point x="320" y="636" type="line"/>
-      <point x="534" y="0" type="line"/>
-      <point x="627" y="0" type="line"/>
-      <point x="383" y="694" type="line"/>
-      <point x="275" y="694" type="line"/>
+      <point x="20" y="0" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="334" y="636" type="line"/>
+      <point x="325" y="636" type="line"/>
+      <point x="539" y="0" type="line"/>
+      <point x="632" y="0" type="line"/>
+      <point x="388" y="694" type="line"/>
+      <point x="280" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="146" y="206" type="line"/>
-      <point x="493" y="206" type="line"/>
-      <point x="493" y="278" type="line"/>
-      <point x="146" y="278" type="line"/>
+      <point x="151" y="206" type="line"/>
+      <point x="498" y="206" type="line"/>
+      <point x="498" y="278" type="line"/>
+      <point x="151" y="278" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_acute.glif b/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
index ed0140d9..c0e1094d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aacute" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
-    <component base="acutecomb.case" xOffset="234"/>
+    <component base="acutecomb.case" xOffset="239"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif
index fbcd28dd..28a256a2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve-cy" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A-cy"/>
-    <component base="brevecomb-cy.case" xOffset="107"/>
+    <component base="brevecomb-cy.case" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breve.glif b/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
index ebcb06f3..5f1123fb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.case" xOffset="113"/>
+    <component base="brevecomb.case" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
index 41b89a07..31ffc643 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreveacute" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_acutecomb.case" xOffset="147" yOffset="12"/>
+    <component base="brevecomb_acutecomb.case" xOffset="152" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif
index 31c1f5c6..f966dfbb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevedotbelow" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="186"/>
-    <component base="brevecomb.case" xOffset="113"/>
+    <component base="dotbelowcomb" xOffset="191"/>
+    <component base="brevecomb.case" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
index c2532df2..9d9f0dfa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevegrave" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_gravecomb.case" xOffset="140" yOffset="12"/>
+    <component base="brevecomb_gravecomb.case" xOffset="145" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif
index 243010d5..e0323fb7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevehookabove" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_hookabovecomb.case" xOffset="145" yOffset="12"/>
+    <component base="brevecomb_hookabovecomb.case" xOffset="150" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif
index a3fdcb37..cc0e7244 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevetilde" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_tildecomb.case" xOffset="116" yOffset="12"/>
+    <component base="brevecomb_tildecomb.case" xOffset="121" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_caron.glif b/src/Cantarell-Regular.ufo/glyphs/A_caron.glif
index a82c6f0f..2c746c44 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acaron" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
-    <component base="caroncomb.case" xOffset="138"/>
+    <component base="caroncomb.case" xOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
index 1f600d30..08b3dff7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflex" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.case" xOffset="134"/>
+    <component base="circumflexcomb.case" xOffset="139"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
index a2755c57..7564dc85 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexacute" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="190" yOffset="12"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="195" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif
index ae49c0b1..804a2a86 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexdotbelow" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="186"/>
-    <component base="circumflexcomb.case" xOffset="134"/>
+    <component base="dotbelowcomb" xOffset="191"/>
+    <component base="circumflexcomb.case" xOffset="139"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
index 2b0e069e..6fbdf138 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexgrave" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="190" yOffset="12"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="195" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif
index 46138373..b06d486c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexhookabove" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="190" yOffset="12"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="195" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif
index ae433804..d51e2a03 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflextilde" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="157" yOffset="12"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="162" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif
index ee5cbcf6..9eec8af6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adblgrave" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
-    <component base="dblgravecomb.case" xOffset="101"/>
+    <component base="dblgravecomb.case" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif
index 9652b40d..1cef3dd7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis-cy" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="A-cy"/>
-    <component base="dieresiscomb.case" xOffset="86"/>
+    <component base="dieresiscomb.case" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
index a9433362..2e719ec0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="00C4"/>
   <outline>
     <component base="A"/>
-    <component base="dieresiscomb.case" xOffset="86"/>
+    <component base="dieresiscomb.case" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
index 3a7c2d8f..8ebe307e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adotbelow" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="186"/>
+    <component base="dotbelowcomb" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_grave.glif b/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
index 21147d36..0a67ce2e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Agrave" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
-    <component base="gravecomb.case" xOffset="127"/>
+    <component base="gravecomb.case" xOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
index f817eb98..8d95e559 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ahookabove" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
-    <component base="hookabovecomb.case" xOffset="178"/>
+    <component base="hookabovecomb.case" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
index 523fb8da..39436b28 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ainvertedbreve" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
-    <component base="breveinvertedcomb.case" xOffset="125"/>
+    <component base="breveinvertedcomb.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_macron.glif b/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
index fb38e94e..c3c17bc7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Amacron" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
-    <component base="macroncomb.case" xOffset="80"/>
+    <component base="macroncomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
index f0e3817c..03015ba9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aogonek" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
-    <component base="ogonekcomb" xOffset="173"/>
+    <component base="ogonekcomb" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ring.glif b/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
index 2285e9e9..ae5ee1d0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aring" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb.case" xOffset="149"/>
+    <component base="ringcomb.case" xOffset="154"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
index a83b5a99..3d3ca169 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aringacute" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb_acutecomb.case" xOffset="162"/>
+    <component base="ringcomb_acutecomb.case" xOffset="167"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
index f50a3f78..f78df820 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Atilde" format="2">
-  <advance width="642"/>
+  <advance width="652"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
-    <component base="tildecomb.case" xOffset="82"/>
+    <component base="tildecomb.case" xOffset="87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/B_.glif b/src/Cantarell-Regular.ufo/glyphs/B_.glif
index 3e22b706..d1c9341b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/B_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/B_.glif
@@ -1,48 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="2">
-  <advance width="640"/>
+  <advance width="648"/>
   <unicode hex="0042"/>
   <note>
 B
 </note>
-  <anchor x="318" y="0" name="bottom"/>
-  <anchor x="318" y="694" name="top"/>
+  <anchor x="322" y="0" name="bottom"/>
+  <anchor x="322" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="338" y="0" type="line" smooth="yes"/>
-      <point x="498" y="0"/>
-      <point x="592" y="75"/>
-      <point x="592" y="202" type="curve" smooth="yes"/>
-      <point x="592" y="319"/>
-      <point x="504" y="396"/>
-      <point x="371" y="396" type="curve" smooth="yes"/>
-      <point x="145" y="396" type="line"/>
-      <point x="145" y="327" type="line"/>
-      <point x="362" y="327" type="line" smooth="yes"/>
-      <point x="450" y="327"/>
-      <point x="507" y="271"/>
-      <point x="507" y="185" type="curve" smooth="yes"/>
-      <point x="507" y="105"/>
-      <point x="459" y="71"/>
-      <point x="348" y="71" type="curve" smooth="yes"/>
-      <point x="179" y="71" type="line"/>
-      <point x="179" y="623" type="line"/>
-      <point x="297" y="623" type="line" smooth="yes"/>
-      <point x="403" y="623"/>
-      <point x="455" y="584"/>
-      <point x="455" y="505" type="curve" smooth="yes"/>
-      <point x="455" y="444"/>
-      <point x="421" y="409"/>
-      <point x="329" y="375" type="curve"/>
-      <point x="449" y="375" type="line"/>
-      <point x="504" y="399"/>
-      <point x="540" y="460"/>
-      <point x="540" y="527" type="curve" smooth="yes"/>
-      <point x="540" y="633"/>
-      <point x="455" y="694"/>
-      <point x="307" y="694" type="curve" smooth="yes"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="342" y="0" type="line" smooth="yes"/>
+      <point x="502" y="0"/>
+      <point x="596" y="75"/>
+      <point x="596" y="202" type="curve" smooth="yes"/>
+      <point x="596" y="319"/>
+      <point x="508" y="396"/>
+      <point x="375" y="396" type="curve" smooth="yes"/>
+      <point x="149" y="396" type="line"/>
+      <point x="149" y="327" type="line"/>
+      <point x="366" y="327" type="line" smooth="yes"/>
+      <point x="454" y="327"/>
+      <point x="511" y="271"/>
+      <point x="511" y="185" type="curve" smooth="yes"/>
+      <point x="511" y="105"/>
+      <point x="463" y="71"/>
+      <point x="352" y="71" type="curve" smooth="yes"/>
+      <point x="183" y="71" type="line"/>
+      <point x="183" y="623" type="line"/>
+      <point x="301" y="623" type="line" smooth="yes"/>
+      <point x="407" y="623"/>
+      <point x="459" y="584"/>
+      <point x="459" y="505" type="curve" smooth="yes"/>
+      <point x="459" y="444"/>
+      <point x="425" y="409"/>
+      <point x="333" y="375" type="curve"/>
+      <point x="453" y="375" type="line"/>
+      <point x="508" y="399"/>
+      <point x="544" y="460"/>
+      <point x="544" y="527" type="curve" smooth="yes"/>
+      <point x="544" y="633"/>
+      <point x="459" y="694"/>
+      <point x="311" y="694" type="curve" smooth="yes"/>
+      <point x="100" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_.glif b/src/Cantarell-Regular.ufo/glyphs/C_.glif
index 2c09d65c..516d58dd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_.glif
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="C" format="2">
-  <advance width="645"/>
+  <advance width="649"/>
   <unicode hex="0043"/>
   <note>
 C
 </note>
-  <anchor x="369" y="0" name="bottom"/>
-  <anchor x="369" y="694" name="top"/>
+  <anchor x="373" y="0" name="bottom"/>
+  <anchor x="373" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="398" y="-10" type="curve" smooth="yes"/>
-      <point x="465" y="-10"/>
-      <point x="535" y="5"/>
-      <point x="601" y="34" type="curve"/>
-      <point x="582" y="95" type="line"/>
-      <point x="532" y="75"/>
-      <point x="470" y="63"/>
-      <point x="417" y="63" type="curve" smooth="yes"/>
-      <point x="251" y="63"/>
-      <point x="141" y="181"/>
-      <point x="141" y="358" type="curve" smooth="yes"/>
-      <point x="141" y="527"/>
-      <point x="242" y="630"/>
-      <point x="409" y="630" type="curve" smooth="yes"/>
-      <point x="465" y="630"/>
-      <point x="528" y="618"/>
-      <point x="581" y="598" type="curve"/>
-      <point x="605" y="660" type="line"/>
-      <point x="554" y="687"/>
-      <point x="482" y="703"/>
-      <point x="414" y="703" type="curve" smooth="yes"/>
-      <point x="199" y="703"/>
-      <point x="56" y="557"/>
-      <point x="56" y="339" type="curve" smooth="yes"/>
-      <point x="56" y="130"/>
-      <point x="193" y="-10"/>
+      <point x="402" y="-10" type="curve" smooth="yes"/>
+      <point x="469" y="-10"/>
+      <point x="539" y="5"/>
+      <point x="605" y="34" type="curve"/>
+      <point x="586" y="95" type="line"/>
+      <point x="536" y="75"/>
+      <point x="474" y="63"/>
+      <point x="421" y="63" type="curve" smooth="yes"/>
+      <point x="255" y="63"/>
+      <point x="145" y="181"/>
+      <point x="145" y="358" type="curve" smooth="yes"/>
+      <point x="145" y="527"/>
+      <point x="246" y="630"/>
+      <point x="413" y="630" type="curve" smooth="yes"/>
+      <point x="469" y="630"/>
+      <point x="532" y="618"/>
+      <point x="585" y="598" type="curve"/>
+      <point x="609" y="660" type="line"/>
+      <point x="558" y="687"/>
+      <point x="486" y="703"/>
+      <point x="418" y="703" type="curve" smooth="yes"/>
+      <point x="203" y="703"/>
+      <point x="60" y="557"/>
+      <point x="60" y="339" type="curve" smooth="yes"/>
+      <point x="60" y="130"/>
+      <point x="197" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_acute.glif b/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
index 65478cce..38e3de09 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cacute" format="2">
-  <advance width="645"/>
+  <advance width="649"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
-    <component base="acutecomb.case" xOffset="281"/>
+    <component base="acutecomb.case" xOffset="285"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_caron.glif b/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
index 94239f3b..3601e641 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
-  <advance width="645"/>
+  <advance width="649"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
-    <component base="caroncomb.case" xOffset="185"/>
+    <component base="caroncomb.case" xOffset="189"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
index dd587a67..596f7498 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
-  <advance width="645"/>
+  <advance width="649"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="222"/>
+    <component base="cedillacomb" xOffset="226"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
index 6c867dee..98a71cc0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedillaacute" format="2">
-  <advance width="645"/>
+  <advance width="649"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="222"/>
-    <component base="acutecomb.case" xOffset="281"/>
+    <component base="cedillacomb" xOffset="226"/>
+    <component base="acutecomb.case" xOffset="285"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
index d761a8ab..f7e41c66 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccircumflex" format="2">
-  <advance width="645"/>
+  <advance width="649"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
-    <component base="circumflexcomb.case" xOffset="181"/>
+    <component base="circumflexcomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
index 97982ec8..a7189083 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cdotaccent" format="2">
-  <advance width="645"/>
+  <advance width="649"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
-    <component base="dotaccentcomb.case" xOffset="233"/>
+    <component base="dotaccentcomb.case" xOffset="237"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_.glif b/src/Cantarell-Regular.ufo/glyphs/D_.glif
index ecec1e80..c65ff9f1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="D" format="2">
-  <advance width="717"/>
+  <advance width="725"/>
   <unicode hex="0044"/>
   <note>
 D
 </note>
-  <anchor x="326" y="0" name="bottom"/>
-  <anchor x="163" y="347" name="center"/>
-  <anchor x="326" y="694" name="top"/>
+  <anchor x="330" y="0" name="bottom"/>
+  <anchor x="167" y="347" name="center"/>
+  <anchor x="330" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="308" y="0" type="line" smooth="yes"/>
-      <point x="518" y="0"/>
-      <point x="661" y="137"/>
-      <point x="661" y="360" type="curve" smooth="yes"/>
-      <point x="661" y="570"/>
-      <point x="535" y="694"/>
-      <point x="323" y="694" type="curve" smooth="yes"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="312" y="0" type="line" smooth="yes"/>
+      <point x="522" y="0"/>
+      <point x="665" y="137"/>
+      <point x="665" y="360" type="curve" smooth="yes"/>
+      <point x="665" y="570"/>
+      <point x="539" y="694"/>
+      <point x="327" y="694" type="curve" smooth="yes"/>
+      <point x="100" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="179" y="72" type="line"/>
-      <point x="179" y="622" type="line"/>
-      <point x="313" y="622" type="line" smooth="yes"/>
-      <point x="482" y="622"/>
-      <point x="576" y="523"/>
-      <point x="576" y="347" type="curve" smooth="yes"/>
-      <point x="576" y="172"/>
-      <point x="483" y="72"/>
-      <point x="318" y="72" type="curve" smooth="yes"/>
+      <point x="183" y="72" type="line"/>
+      <point x="183" y="622" type="line"/>
+      <point x="317" y="622" type="line" smooth="yes"/>
+      <point x="486" y="622"/>
+      <point x="580" y="523"/>
+      <point x="580" y="347" type="curve" smooth="yes"/>
+      <point x="580" y="172"/>
+      <point x="487" y="72"/>
+      <point x="322" y="72" type="curve" smooth="yes"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif b/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif
index c4138388..c84c7e03 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="DZcaron" format="2">
-  <advance width="1355"/>
+  <advance width="1371"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
-    <component base="Zcaron" xOffset="717"/>
+    <component base="Zcaron" xOffset="725"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_caron.glif b/src/Cantarell-Regular.ufo/glyphs/D_caron.glif
index 3fd4b3e5..9a55b978 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcaron" format="2">
-  <advance width="717"/>
+  <advance width="725"/>
   <unicode hex="010E"/>
   <outline>
     <component base="D"/>
-    <component base="caroncomb.case" xOffset="142"/>
+    <component base="caroncomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_croat.glif b/src/Cantarell-Regular.ufo/glyphs/D_croat.glif
index 9f30c874..1e30688b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_croat.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_croat.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcroat" format="2">
-  <advance width="717"/>
+  <advance width="725"/>
   <unicode hex="0110"/>
   <outline>
     <component base="Eth"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif
index de66eaef..4bf906a8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ddotbelow" format="2">
-  <advance width="717"/>
+  <advance width="725"/>
   <unicode hex="1E0C"/>
   <outline>
     <component base="D"/>
-    <component base="dotbelowcomb" xOffset="190"/>
+    <component base="dotbelowcomb" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif
index 33af5ecb..7d90f15b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dlinebelow" format="2">
-  <advance width="717"/>
+  <advance width="725"/>
   <unicode hex="1E0E"/>
   <outline>
     <component base="D"/>
-    <component base="macronbelowcomb" xOffset="81"/>
+    <component base="macronbelowcomb" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif b/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif
index 0e1520e7..45ab4764 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dzcaron" format="2">
-  <advance width="1181"/>
+  <advance width="1189"/>
   <unicode hex="01C5"/>
   <outline>
     <component base="D"/>
-    <component base="zcaron" xOffset="717"/>
+    <component base="zcaron" xOffset="725"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif b/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif
index 835c9806..55e7e280 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dze-cy" format="2">
-  <advance width="577"/>
+  <advance width="590"/>
   <unicode hex="0405"/>
   <outline>
     <component base="S"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_.glif b/src/Cantarell-Regular.ufo/glyphs/E_.glif
index f055a150..58c67643 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_.glif
@@ -1,38 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="0045"/>
   <note>
 E
 </note>
-  <anchor x="305" y="0" name="bottom"/>
-  <anchor x="510" y="10" name="ogonek"/>
-  <anchor x="325" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
+  <anchor x="309" y="0" name="bottom"/>
+  <anchor x="514" y="10" name="ogonek"/>
+  <anchor x="329" y="694" name="top"/>
+  <anchor x="11" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="183" y="0" type="line"/>
+      <point x="183" y="694" type="line"/>
+      <point x="100" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="136" y="0" type="line"/>
-      <point x="532" y="0" type="line"/>
-      <point x="532" y="72" type="line"/>
-      <point x="136" y="72" type="line"/>
+      <point x="140" y="0" type="line"/>
+      <point x="536" y="0" type="line"/>
+      <point x="536" y="72" type="line"/>
+      <point x="140" y="72" type="line"/>
     </contour>
     <contour>
-      <point x="136" y="323" type="line"/>
-      <point x="505" y="323" type="line"/>
-      <point x="505" y="395" type="line"/>
-      <point x="136" y="395" type="line"/>
+      <point x="140" y="323" type="line"/>
+      <point x="509" y="323" type="line"/>
+      <point x="509" y="395" type="line"/>
+      <point x="140" y="395" type="line"/>
     </contour>
     <contour>
-      <point x="136" y="622" type="line"/>
-      <point x="532" y="622" type="line"/>
-      <point x="532" y="694" type="line"/>
-      <point x="136" y="694" type="line"/>
+      <point x="140" y="622" type="line"/>
+      <point x="536" y="622" type="line"/>
+      <point x="536" y="694" type="line"/>
+      <point x="140" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_acute.glif b/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
index 1e3aecf1..56bd579f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eacute" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
-    <component base="acutecomb.case" xOffset="237"/>
+    <component base="acutecomb.case" xOffset="241"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_breve.glif b/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
index 315224d4..1f51237c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ebreve" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
-    <component base="brevecomb.case" xOffset="116"/>
+    <component base="brevecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_caron.glif b/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
index 4cd36df9..b0366887 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecaron" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
-    <component base="caroncomb.case" xOffset="141"/>
+    <component base="caroncomb.case" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
index 7e56c2f9..80000625 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecedillabreve" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
-    <component base="cedillacomb" xOffset="158"/>
-    <component base="brevecomb.case" xOffset="116"/>
+    <component base="cedillacomb" xOffset="162"/>
+    <component base="brevecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
index b549a184..59460254 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflex" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.case" xOffset="137"/>
+    <component base="circumflexcomb.case" xOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
index c409413e..2fd79794 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="193" yOffset="12"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="197" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
index 7e818404..ef17e3ca 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexdotbelow" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="169"/>
-    <component base="circumflexcomb.case" xOffset="137"/>
+    <component base="dotbelowcomb" xOffset="173"/>
+    <component base="circumflexcomb.case" xOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
index 5c749e33..c86802a6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="193" yOffset="12"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="197" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
index 72bcc4cd..aa825f17 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="193" yOffset="12"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="197" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
index b6d99469..ffa50312 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="160" yOffset="12"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="164" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
index e833a285..c2b781ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edblgrave" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
-    <component base="dblgravecomb.case" xOffset="104"/>
+    <component base="dblgravecomb.case" xOffset="108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
index 6b4080f6..9843dcb6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edieresis" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
-    <component base="dieresiscomb.case" xOffset="89"/>
+    <component base="dieresiscomb.case" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
index 16e8086f..fcc5d728 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotaccent" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
-    <component base="dotaccentcomb.case" xOffset="189"/>
+    <component base="dotaccentcomb.case" xOffset="193"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
index 15a76f8e..be4f45c5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotbelow" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="169"/>
+    <component base="dotbelowcomb" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_grave.glif b/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
index 12b255ba..347449e6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Egrave" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
-    <component base="gravecomb.case" xOffset="130"/>
+    <component base="gravecomb.case" xOffset="134"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
index 0a3a3492..74bcdba6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ehookabove" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
-    <component base="hookabovecomb.case" xOffset="181"/>
+    <component base="hookabovecomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
index 10f7347f..c6494618 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Einvertedbreve" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
-    <component base="breveinvertedcomb.case" xOffset="128"/>
+    <component base="breveinvertedcomb.case" xOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif
index 5a192ffd..7c9dc658 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Em-cy" format="2">
-  <advance width="867"/>
+  <advance width="875"/>
   <unicode hex="041C"/>
   <outline>
     <component base="M"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macron.glif b/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
index 862ae538..43194df4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacron" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="83"/>
+    <component base="macroncomb.case" xOffset="87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
index f57d957d..1af32c13 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacronacute" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="83"/>
-    <component base="acutecomb.case" xOffset="237" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="87"/>
+    <component base="acutecomb.case" xOffset="241" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
index f0ea39d8..6e95b41b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacrongrave" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="83"/>
-    <component base="gravecomb.case" xOffset="130" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="87"/>
+    <component base="gravecomb.case" xOffset="134" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif
index f05d4273..7ff42cfd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="En-cy" format="2">
-  <advance width="729"/>
+  <advance width="737"/>
   <unicode hex="041D"/>
   <anchor x="672" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
index 989bdc42..6a313bf3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eogonek" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="0118"/>
   <anchor x="303" y="694" name="top"/>
   <outline>
     <component base="E"/>
-    <component base="ogonekcomb" xOffset="78"/>
+    <component base="ogonekcomb" xOffset="82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
index 13eb601e..d0c92ea0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Er-cy" format="2">
-  <advance width="602"/>
+  <advance width="610"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
index ce9e21b8..320b0533 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Es-cy" format="2">
-  <advance width="645"/>
+  <advance width="649"/>
   <unicode hex="0421"/>
   <anchor x="380" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif
index fd868e08..bda7da84 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Esdescender-cy" format="2">
-  <advance width="645"/>
+  <advance width="649"/>
   <unicode hex="04AA"/>
   <outline>
     <component base="Es-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_th.glif b/src/Cantarell-Regular.ufo/glyphs/E_th.glif
index 18758351..bd12e161 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_th.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_th.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eth" format="2">
-  <advance width="717"/>
+  <advance width="725"/>
   <unicode hex="00D0"/>
   <outline>
     <component base="D"/>
-    <component base="strokeshortcomb.case" xOffset="-65" yOffset="49"/>
+    <component base="strokeshortcomb.case" xOffset="-61" yOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
index 0155b898..d546cd96 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etilde" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
-    <component base="tildecomb.case" xOffset="85"/>
+    <component base="tildecomb.case" xOffset="89"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/F_.glif b/src/Cantarell-Regular.ufo/glyphs/F_.glif
index a44822e0..e78da262 100644
--- a/src/Cantarell-Regular.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/F_.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="F" format="2">
-  <advance width="566"/>
+  <advance width="574"/>
   <unicode hex="0046"/>
   <note>
 F
 </note>
-  <anchor x="263" y="0" name="bottom"/>
-  <anchor x="263" y="694" name="top"/>
+  <anchor x="267" y="0" name="bottom"/>
+  <anchor x="267" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="183" y="0" type="line"/>
+      <point x="183" y="694" type="line"/>
+      <point x="100" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="128" y="322" type="line"/>
-      <point x="498" y="322" type="line"/>
-      <point x="498" y="394" type="line"/>
-      <point x="128" y="394" type="line"/>
+      <point x="132" y="322" type="line"/>
+      <point x="502" y="322" type="line"/>
+      <point x="502" y="394" type="line"/>
+      <point x="132" y="394" type="line"/>
     </contour>
     <contour>
-      <point x="128" y="622" type="line"/>
-      <point x="527" y="622" type="line"/>
-      <point x="527" y="694" type="line"/>
-      <point x="128" y="694" type="line"/>
+      <point x="132" y="622" type="line"/>
+      <point x="531" y="622" type="line"/>
+      <point x="531" y="694" type="line"/>
+      <point x="132" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif b/src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif
index 3d1579f6..6edc2b92 100644
--- a/src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Fita-cy" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="0472"/>
   <outline>
     <component base="Obarred-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_.glif b/src/Cantarell-Regular.ufo/glyphs/G_.glif
index 30bd1458..72a1896e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="G" format="2">
-  <advance width="722"/>
+  <advance width="731"/>
   <unicode hex="0047"/>
   <note>
 G
 </note>
-  <anchor x="395" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
+  <anchor x="399" y="0" name="bottom"/>
+  <anchor x="399" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="404" y="-9" type="curve" smooth="yes"/>
-      <point x="500" y="-9"/>
-      <point x="587" y="19"/>
-      <point x="657" y="74" type="curve"/>
-      <point x="657" y="368" type="line"/>
-      <point x="377" y="368" type="line"/>
-      <point x="377" y="296" type="line"/>
-      <point x="574" y="296" type="line"/>
-      <point x="574" y="71" type="line"/>
-      <point x="593" y="112" type="line"/>
-      <point x="539" y="81"/>
-      <point x="478" y="64"/>
-      <point x="416" y="64" type="curve" smooth="yes"/>
-      <point x="249" y="64"/>
-      <point x="141" y="179"/>
-      <point x="141" y="357" type="curve" smooth="yes"/>
-      <point x="141" y="530"/>
-      <point x="240" y="630"/>
-      <point x="409" y="630" type="curve" smooth="yes"/>
-      <point x="472" y="630"/>
-      <point x="545" y="616"/>
-      <point x="606" y="593" type="curve"/>
-      <point x="630" y="657" type="line"/>
-      <point x="569" y="687"/>
-      <point x="496" y="703"/>
-      <point x="420" y="703" type="curve" smooth="yes"/>
-      <point x="201" y="703"/>
-      <point x="56" y="560"/>
-      <point x="56" y="342" type="curve" smooth="yes"/>
-      <point x="56" y="130"/>
-      <point x="194" y="-9"/>
+      <point x="408" y="-9" type="curve" smooth="yes"/>
+      <point x="504" y="-9"/>
+      <point x="591" y="19"/>
+      <point x="661" y="74" type="curve"/>
+      <point x="661" y="368" type="line"/>
+      <point x="381" y="368" type="line"/>
+      <point x="381" y="296" type="line"/>
+      <point x="578" y="296" type="line"/>
+      <point x="578" y="71" type="line"/>
+      <point x="597" y="112" type="line"/>
+      <point x="543" y="81"/>
+      <point x="482" y="64"/>
+      <point x="420" y="64" type="curve" smooth="yes"/>
+      <point x="253" y="64"/>
+      <point x="145" y="179"/>
+      <point x="145" y="357" type="curve" smooth="yes"/>
+      <point x="145" y="530"/>
+      <point x="244" y="630"/>
+      <point x="413" y="630" type="curve" smooth="yes"/>
+      <point x="476" y="630"/>
+      <point x="549" y="616"/>
+      <point x="610" y="593" type="curve"/>
+      <point x="634" y="657" type="line"/>
+      <point x="573" y="687"/>
+      <point x="500" y="703"/>
+      <point x="424" y="703" type="curve" smooth="yes"/>
+      <point x="205" y="703"/>
+      <point x="60" y="560"/>
+      <point x="60" y="342" type="curve" smooth="yes"/>
+      <point x="60" y="130"/>
+      <point x="198" y="-9"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_breve.glif b/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
index 3c5225ed..d6f86581 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbreve" format="2">
-  <advance width="722"/>
+  <advance width="731"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
-    <component base="brevecomb.case" xOffset="186"/>
+    <component base="brevecomb.case" xOffset="190"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_caron.glif b/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
index 6183a5c5..edfff9d4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcaron" format="2">
-  <advance width="722"/>
+  <advance width="731"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
-    <component base="caroncomb.case" xOffset="211"/>
+    <component base="caroncomb.case" xOffset="215"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
index 89b266c0..af9d6317 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcircumflex" format="2">
-  <advance width="722"/>
+  <advance width="731"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
-    <component base="circumflexcomb.case" xOffset="207"/>
+    <component base="circumflexcomb.case" xOffset="211"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
index c09309ec..74ed183d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcommaaccent" format="2">
-  <advance width="722"/>
+  <advance width="731"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
-    <component base="commaaccentcomb" xOffset="229"/>
+    <component base="commaaccentcomb" xOffset="233"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
index 13ecfd97..36aa5656 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gdotaccent" format="2">
-  <advance width="722"/>
+  <advance width="731"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
-    <component base="dotaccentcomb.case" xOffset="259"/>
+    <component base="dotaccentcomb.case" xOffset="263"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_macron.glif b/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
index 1961e11b..abccd74a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gmacron" format="2">
-  <advance width="722"/>
+  <advance width="731"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
-    <component base="macroncomb.case" xOffset="153"/>
+    <component base="macroncomb.case" xOffset="157"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_.glif b/src/Cantarell-Regular.ufo/glyphs/H_.glif
index b3a4ff8d..013b3381 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_.glif
@@ -1,32 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="H" format="2">
-  <advance width="729"/>
+  <advance width="737"/>
   <unicode hex="0048"/>
   <note>
 H
 </note>
-  <anchor x="365" y="0" name="bottom"/>
-  <anchor x="365" y="539" name="center"/>
-  <anchor x="365" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
+  <anchor x="369" y="0" name="bottom"/>
+  <anchor x="369" y="539" name="center"/>
+  <anchor x="369" y="694" name="top"/>
+  <anchor x="11" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="550" y="0" type="line"/>
-      <point x="633" y="0" type="line"/>
-      <point x="633" y="694" type="line"/>
-      <point x="550" y="694" type="line"/>
+      <point x="554" y="0" type="line"/>
+      <point x="637" y="0" type="line"/>
+      <point x="637" y="694" type="line"/>
+      <point x="554" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="183" y="0" type="line"/>
+      <point x="183" y="694" type="line"/>
+      <point x="100" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="128" y="323" type="line"/>
-      <point x="598" y="323" type="line"/>
-      <point x="598" y="395" type="line"/>
-      <point x="128" y="395" type="line"/>
+      <point x="132" y="323" type="line"/>
+      <point x="602" y="323" type="line"/>
+      <point x="602" y="395" type="line"/>
+      <point x="132" y="395" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
index ced85276..78e9e1de 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ha-cy" format="2">
-  <advance width="643"/>
+  <advance width="651"/>
   <unicode hex="0425"/>
   <anchor x="584" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_bar.glif b/src/Cantarell-Regular.ufo/glyphs/H_bar.glif
index 7739f756..3c40d68d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_bar.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbar" format="2">
-  <advance width="729"/>
+  <advance width="737"/>
   <unicode hex="0126"/>
   <outline>
     <component base="H"/>
-    <component base="strokelongcomb" xOffset="-80" yOffset="197"/>
+    <component base="strokelongcomb" xOffset="-76" yOffset="197"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif
index bc816827..e6e2478b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbrevebelow" format="2">
-  <advance width="729"/>
+  <advance width="737"/>
   <unicode hex="1E2A"/>
   <outline>
     <component base="H"/>
-    <component base="brevebelowcomb" xOffset="159"/>
+    <component base="brevebelowcomb" xOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif
index abb672c0..fd5fd9f5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hcircumflex" format="2">
-  <advance width="729"/>
+  <advance width="737"/>
   <unicode hex="0124"/>
   <outline>
     <component base="H"/>
-    <component base="circumflexcomb.case" xOffset="177"/>
+    <component base="circumflexcomb.case" xOffset="181"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif
index 8e4170f9..fd56b199 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hdotbelow" format="2">
-  <advance width="729"/>
+  <advance width="737"/>
   <unicode hex="1E24"/>
   <outline>
     <component base="H"/>
-    <component base="dotbelowcomb" xOffset="229"/>
+    <component base="dotbelowcomb" xOffset="233"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif
index b16fca96..8cfc0975 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I-cy" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="0406"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_.glif b/src/Cantarell-Regular.ufo/glyphs/I_.glif
index 8c0dedfe..97842826 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="0049"/>
   <note>
 I
 </note>
-  <anchor x="138" y="0" name="bottom"/>
-  <anchor x="157" y="10" name="ogonek"/>
-  <anchor x="138" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
+  <anchor x="142" y="0" name="bottom"/>
+  <anchor x="161" y="10" name="ogonek"/>
+  <anchor x="142" y="694" name="top"/>
+  <anchor x="11" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="183" y="0" type="line"/>
+      <point x="183" y="694" type="line"/>
+      <point x="100" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_acute.glif b/src/Cantarell-Regular.ufo/glyphs/I_acute.glif
index d4733c16..79216f4f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iacute" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="00CD"/>
   <outline>
     <component base="I"/>
-    <component base="acutecomb.case" xOffset="50"/>
+    <component base="acutecomb.case" xOffset="54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_breve.glif b/src/Cantarell-Regular.ufo/glyphs/I_breve.glif
index ec2a126b..d4848efe 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ibreve" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="012C"/>
   <outline>
     <component base="I"/>
-    <component base="brevecomb.case" xOffset="-71"/>
+    <component base="brevecomb.case" xOffset="-67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_caron.glif b/src/Cantarell-Regular.ufo/glyphs/I_caron.glif
index 7ec75856..ffa1be45 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icaron" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="01CF"/>
   <outline>
     <component base="I"/>
-    <component base="caroncomb.case" xOffset="-46"/>
+    <component base="caroncomb.case" xOffset="-42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif
index dd43ea31..7a41c206 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icircumflex" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="00CE"/>
   <outline>
     <component base="I"/>
-    <component base="circumflexcomb.case" xOffset="-50"/>
+    <component base="circumflexcomb.case" xOffset="-46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif
index 1c665fa5..2955bdae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idblgrave" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="0208"/>
   <outline>
     <component base="I"/>
-    <component base="dblgravecomb.case" xOffset="-83"/>
+    <component base="dblgravecomb.case" xOffset="-79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif
index da8a780d..039e3c40 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresis" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="00CF"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-98"/>
+    <component base="dieresiscomb.case" xOffset="-94"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif
index c82970ac..1922502b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresisacute" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="1E2E"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-98"/>
-    <component base="acutecomb.case" xOffset="50" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="-94"/>
+    <component base="acutecomb.case" xOffset="54" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif
index 4b7f22c8..efb6abb3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotaccent" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="0130"/>
   <outline>
     <component base="I"/>
-    <component base="dotaccentcomb.case" xOffset="2"/>
+    <component base="dotaccentcomb.case" xOffset="6"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif
index c0894b48..38a41d1d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotbelow" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="1ECA"/>
   <outline>
     <component base="I"/>
-    <component base="dotbelowcomb" xOffset="2"/>
+    <component base="dotbelowcomb" xOffset="6"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
index 0d803ed8..b2566de7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="0415"/>
   <anchor x="303" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
index 6db7b418..6323f0af 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
index 1f296154..b17dd0fa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_grave.glif b/src/Cantarell-Regular.ufo/glyphs/I_grave.glif
index 6b5a7e15..9ddf1090 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Igrave" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="00CC"/>
   <outline>
     <component base="I"/>
-    <component base="gravecomb.case" xOffset="-57"/>
+    <component base="gravecomb.case" xOffset="-53"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif
index 198a60e5..814e9738 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ihookabove" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="1EC8"/>
   <outline>
     <component base="I"/>
-    <component base="hookabovecomb.case" xOffset="-6"/>
+    <component base="hookabovecomb.case" xOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif
index ae195abd..d2f896f4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iinvertedbreve" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="020A"/>
   <outline>
     <component base="I"/>
-    <component base="breveinvertedcomb.case" xOffset="-59"/>
+    <component base="breveinvertedcomb.case" xOffset="-55"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_macron.glif b/src/Cantarell-Regular.ufo/glyphs/I_macron.glif
index 3aa9e163..05998ada 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Imacron" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="012A"/>
   <outline>
     <component base="I"/>
-    <component base="macroncomb.narrow.case" xOffset="-76"/>
+    <component base="macroncomb.narrow.case" xOffset="-72"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
index 283e29d5..1d3d7403 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="584"/>
+  <advance width="592"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif
index 5cacb3c6..67bda694 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iogonek" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="012E"/>
   <outline>
     <component base="I"/>
-    <component base="ogonekcomb.narrow" xOffset="-252"/>
+    <component base="ogonekcomb.narrow" xOffset="-248"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif
index 6208f5b7..79e2822f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Itilde" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="0128"/>
   <outline>
     <component base="I"/>
-    <component base="tildecomb.case" xOffset="-102"/>
+    <component base="tildecomb.case" xOffset="-98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_.glif b/src/Cantarell-Regular.ufo/glyphs/J_.glif
index fed3b503..ae7f4d13 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="J" format="2">
-  <advance width="407"/>
+  <advance width="417"/>
   <unicode hex="004A"/>
   <note>
 J
 </note>
-  <anchor x="200" y="0" name="bottom"/>
-  <anchor x="275" y="694" name="top"/>
+  <anchor x="206" y="0" name="bottom"/>
+  <anchor x="281" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="133" y="-10" type="curve" smooth="yes"/>
-      <point x="251" y="-10"/>
-      <point x="318" y="65"/>
-      <point x="318" y="200" type="curve" smooth="yes"/>
-      <point x="318" y="694" type="line"/>
-      <point x="235" y="694" type="line"/>
-      <point x="235" y="191" type="line" smooth="yes"/>
-      <point x="235" y="109"/>
-      <point x="198" y="63"/>
-      <point x="131" y="63" type="curve" smooth="yes"/>
-      <point x="101" y="63"/>
-      <point x="61" y="72"/>
-      <point x="33" y="86" type="curve"/>
-      <point x="9" y="24" type="line"/>
-      <point x="49" y="0"/>
-      <point x="91" y="-10"/>
+      <point x="139" y="-10" type="curve" smooth="yes"/>
+      <point x="257" y="-10"/>
+      <point x="324" y="65"/>
+      <point x="324" y="200" type="curve" smooth="yes"/>
+      <point x="324" y="694" type="line"/>
+      <point x="241" y="694" type="line"/>
+      <point x="241" y="191" type="line" smooth="yes"/>
+      <point x="241" y="109"/>
+      <point x="204" y="63"/>
+      <point x="137" y="63" type="curve" smooth="yes"/>
+      <point x="107" y="63"/>
+      <point x="67" y="72"/>
+      <point x="39" y="86" type="curve"/>
+      <point x="15" y="24" type="line"/>
+      <point x="55" y="0"/>
+      <point x="97" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_acute.glif b/src/Cantarell-Regular.ufo/glyphs/J_acute.glif
index 27aa937e..58ff20dc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_acute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jacute" format="2">
-  <advance width="407"/>
+  <advance width="417"/>
   <outline>
     <component base="J"/>
-    <component base="acutecomb.case" xOffset="187"/>
+    <component base="acutecomb.case" xOffset="193"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif
index dd88649a..6f710498 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jcircumflex" format="2">
-  <advance width="407"/>
+  <advance width="417"/>
   <unicode hex="0134"/>
   <outline>
     <component base="J"/>
-    <component base="circumflexcomb.case" xOffset="87"/>
+    <component base="circumflexcomb.case" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif
index c2f6a246..d2ba7bf0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Je-cy" format="2">
-  <advance width="407"/>
+  <advance width="417"/>
   <unicode hex="0408"/>
   <outline>
     <component base="J"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_.glif b/src/Cantarell-Regular.ufo/glyphs/K_.glif
index 94d15dff..766068d5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="K" format="2">
-  <advance width="622"/>
+  <advance width="621"/>
   <unicode hex="004B"/>
   <note>
 K
 </note>
-  <anchor x="314" y="0" name="bottom"/>
-  <anchor x="314" y="694" name="top"/>
+  <anchor x="318" y="0" name="bottom"/>
+  <anchor x="318" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="498" y="0" type="line"/>
-      <point x="607" y="0" type="line"/>
-      <point x="264" y="380" type="line"/>
-      <point x="268" y="357" type="line"/>
-      <point x="594" y="694" type="line"/>
-      <point x="492" y="694" type="line"/>
-      <point x="176" y="361" type="line"/>
+      <point x="502" y="0" type="line"/>
+      <point x="611" y="0" type="line"/>
+      <point x="268" y="380" type="line"/>
+      <point x="272" y="357" type="line"/>
+      <point x="598" y="694" type="line"/>
+      <point x="496" y="694" type="line"/>
+      <point x="180" y="361" type="line"/>
     </contour>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="183" y="0" type="line"/>
+      <point x="183" y="694" type="line"/>
+      <point x="100" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_acute.glif b/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
index df16babb..72018a1e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kacute" format="2">
-  <advance width="622"/>
+  <advance width="621"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
-    <component base="acutecomb.case" xOffset="226"/>
+    <component base="acutecomb.case" xOffset="230"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
index a0b7ddb4..3d506b44 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kcommaaccent" format="2">
-  <advance width="622"/>
+  <advance width="621"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
-    <component base="commaaccentcomb" xOffset="148"/>
+    <component base="commaaccentcomb" xOffset="152"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_.glif b/src/Cantarell-Regular.ufo/glyphs/L_.glif
index 2f4d9bdd..56d48810 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
-  <advance width="515"/>
+  <advance width="529"/>
   <unicode hex="004C"/>
   <note>
 L
 </note>
-  <anchor x="294" y="0" name="bottom"/>
-  <anchor x="164" y="347" name="center"/>
-  <anchor x="535" y="352" name="periodcentered"/>
-  <anchor x="139" y="694" name="top"/>
-  <anchor x="303" y="482" name="topright"/>
+  <anchor x="298" y="0" name="bottom"/>
+  <anchor x="168" y="347" name="center"/>
+  <anchor x="539" y="352" name="periodcentered"/>
+  <anchor x="143" y="694" name="top"/>
+  <anchor x="307" y="482" name="topright"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="490" y="0" type="line"/>
-      <point x="490" y="74" type="line"/>
-      <point x="179" y="74" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="494" y="0" type="line"/>
+      <point x="494" y="74" type="line"/>
+      <point x="183" y="74" type="line"/>
+      <point x="183" y="694" type="line"/>
+      <point x="100" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_J_.glif b/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
index cbbf4412..81f2636e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="LJ" format="2">
-  <advance width="922"/>
+  <advance width="946"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="515"/>
+    <component base="J" xOffset="529"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_acute.glif b/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
index 41739fca..e4437555 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lacute" format="2">
-  <advance width="515"/>
+  <advance width="529"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
-    <component base="acutecomb.case" xOffset="51"/>
+    <component base="acutecomb.case" xOffset="55"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_caron.glif b/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
index 2d827602..d8d118d5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcaron" format="2">
-  <advance width="515"/>
+  <advance width="529"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
-    <component base="caroncomb.alt" xOffset="177"/>
+    <component base="caroncomb.alt" xOffset="181"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
index c281c5d0..663003bd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
-  <advance width="515"/>
+  <advance width="529"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
-    <component base="commaaccentcomb" xOffset="128"/>
+    <component base="commaaccentcomb" xOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_dot.glif b/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
index e13b3744..00107d28 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="2">
-  <advance width="515"/>
+  <advance width="529"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
-    <component base="periodcentered.loclCAT.case" xOffset="535"/>
+    <component base="periodcentered.loclCAT.case" xOffset="539"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
index e8e385b9..494ad755 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldotbelow" format="2">
-  <advance width="515"/>
+  <advance width="529"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
-    <component base="dotbelowcomb" xOffset="158"/>
+    <component base="dotbelowcomb" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_j.glif b/src/Cantarell-Regular.ufo/glyphs/L_j.glif
index 099406d8..027aa274 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_j.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lj" format="2">
-  <advance width="770"/>
+  <advance width="784"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="515"/>
+    <component base="j" xOffset="529"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
index 419438ea..52049ffc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Llinebelow" format="2">
-  <advance width="515"/>
+  <advance width="529"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
-    <component base="macronbelowcomb" xOffset="49"/>
+    <component base="macronbelowcomb" xOffset="53"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_slash.glif b/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
index bf989786..46b6f9b1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="2">
-  <advance width="515"/>
+  <advance width="529"/>
   <unicode hex="0141"/>
   <outline>
     <component base="L"/>
-    <component base="slashshortcomb.case" xOffset="-17" yOffset="65"/>
+    <component base="slashshortcomb.case" xOffset="-13" yOffset="65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/M_.glif b/src/Cantarell-Regular.ufo/glyphs/M_.glif
index 2a1c5069..5689f183 100644
--- a/src/Cantarell-Regular.ufo/glyphs/M_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/M_.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="M" format="2">
-  <advance width="867"/>
+  <advance width="875"/>
   <unicode hex="004D"/>
   <note>
 M
 </note>
-  <anchor x="434" y="0" name="bottom"/>
-  <anchor x="434" y="694" name="top"/>
+  <anchor x="438" y="0" name="bottom"/>
+  <anchor x="438" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="175" y="0" type="line"/>
-      <point x="175" y="578" type="line"/>
-      <point x="158" y="578" type="line"/>
-      <point x="400" y="108" type="line"/>
-      <point x="465" y="108" type="line"/>
-      <point x="704" y="578" type="line"/>
-      <point x="692" y="578" type="line"/>
-      <point x="692" y="0" type="line"/>
-      <point x="771" y="0" type="line"/>
-      <point x="771" y="694" type="line"/>
-      <point x="689" y="694" type="line"/>
-      <point x="410" y="148" type="line"/>
-      <point x="460" y="148" type="line"/>
-      <point x="181" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="179" y="0" type="line"/>
+      <point x="179" y="578" type="line"/>
+      <point x="162" y="578" type="line"/>
+      <point x="404" y="108" type="line"/>
+      <point x="469" y="108" type="line"/>
+      <point x="708" y="578" type="line"/>
+      <point x="696" y="578" type="line"/>
+      <point x="696" y="0" type="line"/>
+      <point x="775" y="0" type="line"/>
+      <point x="775" y="694" type="line"/>
+      <point x="693" y="694" type="line"/>
+      <point x="414" y="148" type="line"/>
+      <point x="464" y="148" type="line"/>
+      <point x="185" y="694" type="line"/>
+      <point x="100" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif
index fb6db497..b5d03bff 100644
--- a/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Mdotbelow" format="2">
-  <advance width="867"/>
+  <advance width="875"/>
   <unicode hex="1E42"/>
   <outline>
     <component base="M"/>
-    <component base="dotbelowcomb" xOffset="298"/>
+    <component base="dotbelowcomb" xOffset="302"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_.glif b/src/Cantarell-Regular.ufo/glyphs/N_.glif
index c4e9115f..a20d9f81 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_.glif
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="N" format="2">
-  <advance width="758"/>
+  <advance width="766"/>
   <unicode hex="004E"/>
   <note>
 N
 </note>
-  <anchor x="379" y="0" name="bottom"/>
-  <anchor x="379" y="694" name="top"/>
+  <anchor x="383" y="0" name="bottom"/>
+  <anchor x="383" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="174" y="0" type="line"/>
-      <point x="174" y="605" type="line"/>
-      <point x="159" y="605" type="line"/>
-      <point x="570" y="0" type="line"/>
-      <point x="662" y="0" type="line"/>
-      <point x="662" y="694" type="line"/>
-      <point x="584" y="694" type="line"/>
-      <point x="584" y="87" type="line"/>
-      <point x="600" y="87" type="line"/>
-      <point x="191" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="178" y="0" type="line"/>
+      <point x="178" y="605" type="line"/>
+      <point x="163" y="605" type="line"/>
+      <point x="574" y="0" type="line"/>
+      <point x="666" y="0" type="line"/>
+      <point x="666" y="694" type="line"/>
+      <point x="588" y="694" type="line"/>
+      <point x="588" y="87" type="line"/>
+      <point x="604" y="87" type="line"/>
+      <point x="195" y="694" type="line"/>
+      <point x="100" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_J_.glif b/src/Cantarell-Regular.ufo/glyphs/N_J_.glif
index 9c9d32bc..47c5253f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_J_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="NJ" format="2">
-  <advance width="1165"/>
+  <advance width="1183"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
-    <component base="J" xOffset="758"/>
+    <component base="J" xOffset="766"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_acute.glif b/src/Cantarell-Regular.ufo/glyphs/N_acute.glif
index b10e07d2..2c2baae2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nacute" format="2">
-  <advance width="758"/>
+  <advance width="766"/>
   <unicode hex="0143"/>
   <outline>
     <component base="N"/>
-    <component base="acutecomb.case" xOffset="291"/>
+    <component base="acutecomb.case" xOffset="295"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_caron.glif b/src/Cantarell-Regular.ufo/glyphs/N_caron.glif
index 2c8515c3..027296f0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncaron" format="2">
-  <advance width="758"/>
+  <advance width="766"/>
   <unicode hex="0147"/>
   <outline>
     <component base="N"/>
-    <component base="caroncomb.case" xOffset="195"/>
+    <component base="caroncomb.case" xOffset="199"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif
index b611a6fe..b5d11ac4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncommaaccent" format="2">
-  <advance width="758"/>
+  <advance width="766"/>
   <unicode hex="0145"/>
   <outline>
     <component base="N"/>
-    <component base="commaaccentcomb" xOffset="213"/>
+    <component base="commaaccentcomb" xOffset="217"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif
index 9d4cf866..c2532366 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotaccent" format="2">
-  <advance width="758"/>
+  <advance width="766"/>
   <unicode hex="1E44"/>
   <outline>
     <component base="N"/>
-    <component base="dotaccentcomb.case" xOffset="243"/>
+    <component base="dotaccentcomb.case" xOffset="247"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif
index 628cdaf3..cb7d774e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotbelow" format="2">
-  <advance width="758"/>
+  <advance width="766"/>
   <unicode hex="1E46"/>
   <outline>
     <component base="N"/>
-    <component base="dotbelowcomb" xOffset="243"/>
+    <component base="dotbelowcomb" xOffset="247"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_j.glif b/src/Cantarell-Regular.ufo/glyphs/N_j.glif
index db362ff8..8d506d5f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_j.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nj" format="2">
-  <advance width="1013"/>
+  <advance width="1021"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
-    <component base="j" xOffset="758"/>
+    <component base="j" xOffset="766"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif
index 33a9f3ff..115bcfe9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nlinebelow" format="2">
-  <advance width="758"/>
+  <advance width="766"/>
   <unicode hex="1E48"/>
   <outline>
     <component base="N"/>
-    <component base="macronbelowcomb" xOffset="134"/>
+    <component base="macronbelowcomb" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif
index de5974b4..6fa394f7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ntilde" format="2">
-  <advance width="758"/>
+  <advance width="766"/>
   <unicode hex="00D1"/>
   <outline>
     <component base="N"/>
-    <component base="tildecomb.case" xOffset="139"/>
+    <component base="tildecomb.case" xOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
index ea972eae..398d510a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O-cy" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="041E"/>
   <anchor x="394" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_.glif b/src/Cantarell-Regular.ufo/glyphs/O_.glif
index dde1e035..1c4d1ede 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="004F"/>
   <note>
 O
 </note>
-  <anchor x="580" y="107" name="Qtail"/>
-  <anchor x="382" y="0" name="bottom"/>
-  <anchor x="382" y="347" name="center"/>
-  <anchor x="463" y="10" name="ogonek"/>
-  <anchor x="382" y="694" name="top"/>
-  <anchor x="11" y="694" name="topleft"/>
-  <anchor x="697" y="694" name="topright"/>
+  <anchor x="585" y="107" name="Qtail"/>
+  <anchor x="387" y="0" name="bottom"/>
+  <anchor x="387" y="347" name="center"/>
+  <anchor x="468" y="10" name="ogonek"/>
+  <anchor x="387" y="694" name="top"/>
+  <anchor x="16" y="694" name="topleft"/>
+  <anchor x="702" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="374" y="-7" type="curve" smooth="yes"/>
-      <point x="574" y="-7"/>
-      <point x="708" y="138"/>
-      <point x="708" y="356" type="curve" smooth="yes"/>
-      <point x="708" y="564"/>
-      <point x="578" y="703"/>
-      <point x="384" y="703" type="curve" smooth="yes"/>
-      <point x="187" y="703"/>
-      <point x="56" y="559"/>
-      <point x="56" y="344" type="curve" smooth="yes"/>
-      <point x="56" y="133"/>
-      <point x="183" y="-7"/>
+      <point x="379" y="-7" type="curve" smooth="yes"/>
+      <point x="579" y="-7"/>
+      <point x="713" y="138"/>
+      <point x="713" y="356" type="curve" smooth="yes"/>
+      <point x="713" y="564"/>
+      <point x="583" y="703"/>
+      <point x="389" y="703" type="curve" smooth="yes"/>
+      <point x="192" y="703"/>
+      <point x="61" y="559"/>
+      <point x="61" y="344" type="curve" smooth="yes"/>
+      <point x="61" y="133"/>
+      <point x="188" y="-7"/>
     </contour>
     <contour>
-      <point x="384" y="65" type="curve" smooth="yes"/>
-      <point x="238" y="65"/>
-      <point x="141" y="181"/>
-      <point x="141" y="356" type="curve" smooth="yes"/>
-      <point x="141" y="520"/>
-      <point x="234" y="630"/>
-      <point x="374" y="630" type="curve" smooth="yes"/>
-      <point x="523" y="630"/>
-      <point x="623" y="516"/>
-      <point x="623" y="344" type="curve" smooth="yes"/>
-      <point x="623" y="177"/>
-      <point x="527" y="65"/>
+      <point x="389" y="65" type="curve" smooth="yes"/>
+      <point x="243" y="65"/>
+      <point x="146" y="181"/>
+      <point x="146" y="356" type="curve" smooth="yes"/>
+      <point x="146" y="520"/>
+      <point x="239" y="630"/>
+      <point x="379" y="630" type="curve" smooth="yes"/>
+      <point x="528" y="630"/>
+      <point x="628" y="516"/>
+      <point x="628" y="344" type="curve" smooth="yes"/>
+      <point x="628" y="177"/>
+      <point x="532" y="65"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_E_.glif b/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
index 48d530e6..d362d7b2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
@@ -1,61 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="OE" format="2">
-  <advance width="995"/>
+  <advance width="1004"/>
   <unicode hex="0152"/>
-  <anchor x="557" y="0" name="bottom"/>
-  <anchor x="557" y="694" name="top"/>
+  <anchor x="562" y="0" name="bottom"/>
+  <anchor x="562" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="405" y="-7" type="curve" smooth="yes"/>
-      <point x="459" y="-7"/>
-      <point x="531" y="1"/>
-      <point x="555" y="10" type="curve"/>
-      <point x="515" y="79" type="line"/>
-      <point x="494" y="71"/>
-      <point x="450" y="65"/>
-      <point x="405" y="65" type="curve" smooth="yes"/>
-      <point x="244" y="65"/>
-      <point x="141" y="178"/>
-      <point x="141" y="355" type="curve" smooth="yes"/>
-      <point x="141" y="525"/>
-      <point x="237" y="630"/>
-      <point x="397" y="630" type="curve" smooth="yes"/>
-      <point x="442" y="630"/>
-      <point x="489" y="625"/>
-      <point x="515" y="611" type="curve"/>
-      <point x="555" y="686" type="line"/>
-      <point x="531" y="695"/>
-      <point x="458" y="703"/>
-      <point x="406" y="703" type="curve" smooth="yes"/>
-      <point x="189" y="703"/>
-      <point x="56" y="564"/>
-      <point x="56" y="343" type="curve" smooth="yes"/>
-      <point x="56" y="127"/>
-      <point x="183" y="-7"/>
+      <point x="410" y="-7" type="curve" smooth="yes"/>
+      <point x="464" y="-7"/>
+      <point x="536" y="1"/>
+      <point x="560" y="10" type="curve"/>
+      <point x="520" y="79" type="line"/>
+      <point x="499" y="71"/>
+      <point x="455" y="65"/>
+      <point x="410" y="65" type="curve" smooth="yes"/>
+      <point x="249" y="65"/>
+      <point x="146" y="178"/>
+      <point x="146" y="355" type="curve" smooth="yes"/>
+      <point x="146" y="525"/>
+      <point x="242" y="630"/>
+      <point x="402" y="630" type="curve" smooth="yes"/>
+      <point x="447" y="630"/>
+      <point x="494" y="625"/>
+      <point x="520" y="611" type="curve"/>
+      <point x="560" y="686" type="line"/>
+      <point x="536" y="695"/>
+      <point x="463" y="703"/>
+      <point x="411" y="703" type="curve" smooth="yes"/>
+      <point x="194" y="703"/>
+      <point x="61" y="564"/>
+      <point x="61" y="343" type="curve" smooth="yes"/>
+      <point x="61" y="127"/>
+      <point x="188" y="-7"/>
     </contour>
     <contour>
-      <point x="507" y="0" type="line"/>
-      <point x="590" y="0" type="line"/>
-      <point x="590" y="694" type="line"/>
-      <point x="507" y="694" type="line"/>
+      <point x="512" y="0" type="line"/>
+      <point x="595" y="0" type="line"/>
+      <point x="595" y="694" type="line"/>
+      <point x="512" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="547" y="0" type="line"/>
-      <point x="943" y="0" type="line"/>
-      <point x="943" y="72" type="line"/>
-      <point x="547" y="72" type="line"/>
+      <point x="552" y="0" type="line"/>
+      <point x="948" y="0" type="line"/>
+      <point x="948" y="72" type="line"/>
+      <point x="552" y="72" type="line"/>
     </contour>
     <contour>
-      <point x="547" y="323" type="line"/>
-      <point x="916" y="323" type="line"/>
-      <point x="916" y="395" type="line"/>
-      <point x="547" y="395" type="line"/>
+      <point x="552" y="323" type="line"/>
+      <point x="921" y="323" type="line"/>
+      <point x="921" y="395" type="line"/>
+      <point x="552" y="395" type="line"/>
     </contour>
     <contour>
-      <point x="547" y="622" type="line"/>
-      <point x="943" y="622" type="line"/>
-      <point x="943" y="694" type="line"/>
-      <point x="547" y="694" type="line"/>
+      <point x="552" y="622" type="line"/>
+      <point x="948" y="622" type="line"/>
+      <point x="948" y="694" type="line"/>
+      <point x="552" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_acute.glif b/src/Cantarell-Regular.ufo/glyphs/O_acute.glif
index 20ab7503..ef988d3f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oacute" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="00D3"/>
   <outline>
     <component base="O"/>
-    <component base="acutecomb.case" xOffset="294"/>
+    <component base="acutecomb.case" xOffset="299"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif
index 385b4f7d..8899093a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Obarred-cy" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="04E8"/>
   <outline>
     <component base="O"/>
-    <component base="_bar-cy" xOffset="-63" yOffset="5"/>
+    <component base="_bar-cy" xOffset="-58" yOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_breve.glif b/src/Cantarell-Regular.ufo/glyphs/O_breve.glif
index f3bd0e1a..934f017d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Obreve" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="014E"/>
   <outline>
     <component base="O"/>
-    <component base="brevecomb.case" xOffset="173"/>
+    <component base="brevecomb.case" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_caron.glif b/src/Cantarell-Regular.ufo/glyphs/O_caron.glif
index c575c10f..1726b05b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocaron" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="01D1"/>
   <outline>
     <component base="O"/>
-    <component base="caroncomb.case" xOffset="198"/>
+    <component base="caroncomb.case" xOffset="203"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif
index 5f8feed3..5054f3ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflex" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="00D4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.case" xOffset="194"/>
+    <component base="circumflexcomb.case" xOffset="199"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif
index 05bab67f..1b737409 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexacute" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1ED0"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="250" yOffset="12"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="255" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexdotbelow.glif
index 812506d9..eff6175a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexdotbelow" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1ED8"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="246"/>
-    <component base="circumflexcomb.case" xOffset="194"/>
+    <component base="dotbelowcomb" xOffset="251"/>
+    <component base="circumflexcomb.case" xOffset="199"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif
index f8516f58..6b706b04 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexgrave" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1ED2"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="250" yOffset="12"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="255" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexhookabove.glif
index 9a1962c6..bb44e3e4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexhookabove" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1ED4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="250" yOffset="12"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="255" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflextilde.glif
index 3a4252f4..5b69e26d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflextilde" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1ED6"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="217" yOffset="12"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="222" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif
index 2079a36b..393e13dd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odblgrave" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="020C"/>
   <outline>
     <component base="O"/>
-    <component base="dblgravecomb.case" xOffset="161"/>
+    <component base="dblgravecomb.case" xOffset="166"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif
index f07ebc34..e981523c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis-cy" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="04E6"/>
   <outline>
     <component base="O-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif
index 4d4ff1bb..e673209e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="00D6"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="146"/>
+    <component base="dieresiscomb.case" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif
index 754b52b4..bc8d5891 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresismacron" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="022A"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="146"/>
-    <component base="macroncomb.case" xOffset="140" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="151"/>
+    <component base="macroncomb.case" xOffset="145" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dotaccentmacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dotaccentmacron.glif
index d8a5b292..35769c09 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dotaccentmacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dotaccentmacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotaccentmacron" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="0230"/>
   <outline>
     <component base="O"/>
-    <component base="dotaccentcomb.case" xOffset="246"/>
-    <component base="macroncomb.case" xOffset="140" yOffset="162"/>
+    <component base="dotaccentcomb.case" xOffset="251"/>
+    <component base="macroncomb.case" xOffset="145" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif
index b6181be3..8c09f1d9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotbelow" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1ECC"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="246"/>
+    <component base="dotbelowcomb" xOffset="251"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_grave.glif b/src/Cantarell-Regular.ufo/glyphs/O_grave.glif
index a7204a42..3562b575 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ograve" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="00D2"/>
   <outline>
     <component base="O"/>
-    <component base="gravecomb.case" xOffset="187"/>
+    <component base="gravecomb.case" xOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif
index 95882c1c..ab847391 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohookabove" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1ECE"/>
   <outline>
     <component base="O"/>
-    <component base="hookabovecomb.case" xOffset="238"/>
+    <component base="hookabovecomb.case" xOffset="243"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horn.glif b/src/Cantarell-Regular.ufo/glyphs/O_horn.glif
index d3b0661f..152ecbfb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_horn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_horn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorn" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="01A0"/>
   <outline>
     <component base="O"/>
-    <component base="horncomb" xOffset="555" yOffset="212"/>
+    <component base="horncomb" xOffset="560" yOffset="212"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif
index 25dcfcb8..5cf9489c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornacute" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1EDA"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="acutecomb.case" xOffset="294"/>
+    <component base="acutecomb.case" xOffset="299"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif
index 1f33c2be..7748c98b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorndotbelow" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1EE2"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="dotbelowcomb" xOffset="246"/>
+    <component base="dotbelowcomb" xOffset="251"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif
index e8054223..9341253f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorngrave" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1EDC"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="gravecomb.case" xOffset="187"/>
+    <component base="gravecomb.case" xOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif
index 10f41af4..3df556da 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornhookabove" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1EDE"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="hookabovecomb.case" xOffset="238"/>
+    <component base="hookabovecomb.case" xOffset="243"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif
index 4bd4cd11..c2bc4d58 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorntilde" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1EE0"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="tildecomb.case" xOffset="142"/>
+    <component base="tildecomb.case" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif
index eebe0eda..c55abac2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohungarumlaut" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="0150"/>
   <outline>
     <component base="O"/>
-    <component base="hungarumlautcomb.case" xOffset="172"/>
+    <component base="hungarumlautcomb.case" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif
index e5190a36..81c243d4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oinvertedbreve" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="020E"/>
   <outline>
     <component base="O"/>
-    <component base="breveinvertedcomb.case" xOffset="185"/>
+    <component base="breveinvertedcomb.case" xOffset="190"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_macron.glif b/src/Cantarell-Regular.ufo/glyphs/O_macron.glif
index 782457f2..8fd1ed11 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacron" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="014C"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="140"/>
+    <component base="macroncomb.case" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif
index 6b6e9962..bd7e1348 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacronacute" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1E52"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="140"/>
-    <component base="acutecomb.case" xOffset="294" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="145"/>
+    <component base="acutecomb.case" xOffset="299" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_macrongrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_macrongrave.glif
index 2e2e7933..41dd3228 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_macrongrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacrongrave" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1E50"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="140"/>
-    <component base="gravecomb.case" xOffset="187" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="145"/>
+    <component base="gravecomb.case" xOffset="192" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif
index f5986c8e..83117318 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oogonek" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="01EA"/>
   <outline>
     <component base="O"/>
-    <component base="ogonekcomb.tall.case" xOffset="31"/>
+    <component base="ogonekcomb.tall.case" xOffset="36"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_slash.glif b/src/Cantarell-Regular.ufo/glyphs/O_slash.glif
index 4cfc1a34..34ebea8d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_slash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslash" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="00D8"/>
   <outline>
     <component base="O"/>
-    <component base="slashlongcomb.case" xOffset="112" yOffset="-2"/>
+    <component base="slashlongcomb.case" xOffset="117" yOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif
index b7ed96b1..9f818818 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslashacute" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="01FE"/>
   <outline>
     <component base="Oslash"/>
-    <component base="acutecomb.case" xOffset="294"/>
+    <component base="acutecomb.case" xOffset="299"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif
index 217f533a..a768ddc8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otilde" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="00D5"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="142"/>
+    <component base="tildecomb.case" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif
index e651e850..eeefce1e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildeacute" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1E4C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="142"/>
-    <component base="acutecomb.case" xOffset="295" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="147"/>
+    <component base="acutecomb.case" xOffset="300" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tildedieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_tildedieresis.glif
index 56ba098b..8dad0675 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_tildedieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_tildedieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildedieresis" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="1E4E"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="142"/>
-    <component base="dieresiscomb.case" xOffset="147" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="147"/>
+    <component base="dieresiscomb.case" xOffset="152" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tildemacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_tildemacron.glif
index 0cf48962..3bfbb76c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_tildemacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_tildemacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildemacron" format="2">
-  <advance width="764"/>
+  <advance width="774"/>
   <unicode hex="022C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="142"/>
-    <component base="macroncomb.case" xOffset="141" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="147"/>
+    <component base="macroncomb.case" xOffset="146" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/P_.glif b/src/Cantarell-Regular.ufo/glyphs/P_.glif
index a6471a37..b131798d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/P_.glif
@@ -1,38 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="P" format="2">
-  <advance width="602"/>
+  <advance width="610"/>
   <unicode hex="0050"/>
   <note>
 P
 </note>
-  <anchor x="297" y="0" name="bottom"/>
-  <anchor x="297" y="694" name="top"/>
+  <anchor x="301" y="0" name="bottom"/>
+  <anchor x="301" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="183" y="0" type="line"/>
+      <point x="183" y="694" type="line"/>
+      <point x="100" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="149" y="242" type="line"/>
-      <point x="297" y="242" type="line" smooth="yes"/>
-      <point x="452" y="242"/>
-      <point x="556" y="334"/>
-      <point x="556" y="473" type="curve" smooth="yes"/>
-      <point x="556" y="606"/>
-      <point x="458" y="694"/>
-      <point x="312" y="694" type="curve" smooth="yes"/>
-      <point x="149" y="694" type="line"/>
-      <point x="149" y="622" type="line"/>
-      <point x="302" y="622" type="line" smooth="yes"/>
-      <point x="403" y="622"/>
-      <point x="471" y="556"/>
-      <point x="471" y="458" type="curve" smooth="yes"/>
-      <point x="471" y="364"/>
-      <point x="415" y="314"/>
-      <point x="312" y="314" type="curve" smooth="yes"/>
-      <point x="149" y="314" type="line"/>
+      <point x="153" y="242" type="line"/>
+      <point x="301" y="242" type="line" smooth="yes"/>
+      <point x="456" y="242"/>
+      <point x="560" y="334"/>
+      <point x="560" y="473" type="curve" smooth="yes"/>
+      <point x="560" y="606"/>
+      <point x="462" y="694"/>
+      <point x="316" y="694" type="curve" smooth="yes"/>
+      <point x="153" y="694" type="line"/>
+      <point x="153" y="622" type="line"/>
+      <point x="306" y="622" type="line" smooth="yes"/>
+      <point x="407" y="622"/>
+      <point x="475" y="556"/>
+      <point x="475" y="458" type="curve" smooth="yes"/>
+      <point x="475" y="364"/>
+      <point x="419" y="314"/>
+      <point x="316" y="314" type="curve" smooth="yes"/>
+      <point x="153" y="314" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif
index e05d5150..f55d169b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Palochka-cy" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="04C0"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Q_.glif b/src/Cantarell-Regular.ufo/glyphs/Q_.glif
index cdd059b0..9b96a805 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Q_.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Q" format="2">
-  <advance width="779"/>
+  <advance width="787"/>
   <unicode hex="0051"/>
   <note>
 Q
 </note>
-  <anchor x="383" y="0" name="bottom"/>
-  <anchor x="383" y="694" name="top"/>
+  <anchor x="387" y="0" name="bottom"/>
+  <anchor x="387" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="375" y="-7" type="curve" smooth="yes"/>
-      <point x="575" y="-7"/>
-      <point x="709" y="138"/>
-      <point x="709" y="356" type="curve" smooth="yes"/>
-      <point x="709" y="564"/>
-      <point x="579" y="703"/>
-      <point x="385" y="703" type="curve" smooth="yes"/>
-      <point x="188" y="703"/>
-      <point x="57" y="559"/>
-      <point x="57" y="344" type="curve" smooth="yes"/>
-      <point x="57" y="133"/>
-      <point x="184" y="-7"/>
+      <point x="379" y="-7" type="curve" smooth="yes"/>
+      <point x="579" y="-7"/>
+      <point x="713" y="138"/>
+      <point x="713" y="356" type="curve" smooth="yes"/>
+      <point x="713" y="564"/>
+      <point x="583" y="703"/>
+      <point x="389" y="703" type="curve" smooth="yes"/>
+      <point x="192" y="703"/>
+      <point x="61" y="559"/>
+      <point x="61" y="344" type="curve" smooth="yes"/>
+      <point x="61" y="133"/>
+      <point x="188" y="-7"/>
     </contour>
     <contour>
-      <point x="385" y="65" type="curve" smooth="yes"/>
-      <point x="239" y="65"/>
-      <point x="142" y="181"/>
-      <point x="142" y="356" type="curve" smooth="yes"/>
-      <point x="142" y="520"/>
-      <point x="235" y="630"/>
-      <point x="375" y="630" type="curve" smooth="yes"/>
-      <point x="524" y="630"/>
-      <point x="624" y="516"/>
-      <point x="624" y="344" type="curve" smooth="yes"/>
-      <point x="624" y="177"/>
-      <point x="528" y="65"/>
+      <point x="389" y="65" type="curve" smooth="yes"/>
+      <point x="243" y="65"/>
+      <point x="146" y="181"/>
+      <point x="146" y="356" type="curve" smooth="yes"/>
+      <point x="146" y="520"/>
+      <point x="239" y="630"/>
+      <point x="379" y="630" type="curve" smooth="yes"/>
+      <point x="528" y="630"/>
+      <point x="628" y="516"/>
+      <point x="628" y="344" type="curve" smooth="yes"/>
+      <point x="628" y="177"/>
+      <point x="532" y="65"/>
     </contour>
     <contour>
-      <point x="679" y="-32" type="line"/>
-      <point x="728" y="19" type="line"/>
-      <point x="419" y="309" type="line"/>
-      <point x="374" y="259" type="line"/>
+      <point x="683" y="-32" type="line"/>
+      <point x="732" y="19" type="line"/>
+      <point x="423" y="309" type="line"/>
+      <point x="378" y="259" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
index b5fe9c76..414fd527 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Qa-cy" format="2">
-  <advance width="779"/>
+  <advance width="787"/>
   <unicode hex="051A"/>
   <outline>
     <component base="Q"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_.glif b/src/Cantarell-Regular.ufo/glyphs/R_.glif
index 8290408b..968192d6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_.glif
@@ -1,44 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="R" format="2">
-  <advance width="633"/>
+  <advance width="641"/>
   <unicode hex="0052"/>
   <note>
 R
 </note>
-  <anchor x="313" y="0" name="bottom"/>
-  <anchor x="313" y="694" name="top"/>
+  <anchor x="317" y="0" name="bottom"/>
+  <anchor x="317" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="183" y="0" type="line"/>
+      <point x="183" y="694" type="line"/>
+      <point x="100" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="149" y="281" type="line"/>
-      <point x="316" y="281" type="line" smooth="yes"/>
-      <point x="460" y="281"/>
-      <point x="558" y="372"/>
-      <point x="558" y="500" type="curve" smooth="yes"/>
-      <point x="558" y="622"/>
-      <point x="468" y="694"/>
-      <point x="326" y="694" type="curve" smooth="yes"/>
-      <point x="149" y="694" type="line"/>
-      <point x="149" y="622" type="line"/>
-      <point x="316" y="622" type="line" smooth="yes"/>
-      <point x="415" y="622"/>
-      <point x="473" y="571"/>
-      <point x="473" y="485" type="curve" smooth="yes"/>
-      <point x="473" y="400"/>
-      <point x="421" y="351"/>
-      <point x="326" y="351" type="curve" smooth="yes"/>
-      <point x="149" y="351" type="line"/>
+      <point x="153" y="281" type="line"/>
+      <point x="320" y="281" type="line" smooth="yes"/>
+      <point x="464" y="281"/>
+      <point x="562" y="372"/>
+      <point x="562" y="500" type="curve" smooth="yes"/>
+      <point x="562" y="622"/>
+      <point x="472" y="694"/>
+      <point x="330" y="694" type="curve" smooth="yes"/>
+      <point x="153" y="694" type="line"/>
+      <point x="153" y="622" type="line"/>
+      <point x="320" y="622" type="line" smooth="yes"/>
+      <point x="419" y="622"/>
+      <point x="477" y="571"/>
+      <point x="477" y="485" type="curve" smooth="yes"/>
+      <point x="477" y="400"/>
+      <point x="425" y="351"/>
+      <point x="330" y="351" type="curve" smooth="yes"/>
+      <point x="153" y="351" type="line"/>
     </contour>
     <contour>
-      <point x="499" y="0" type="line"/>
-      <point x="598" y="0" type="line"/>
-      <point x="406" y="328" type="line"/>
-      <point x="311" y="328" type="line"/>
+      <point x="503" y="0" type="line"/>
+      <point x="602" y="0" type="line"/>
+      <point x="410" y="328" type="line"/>
+      <point x="315" y="328" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_acute.glif b/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
index 7fd6b19c..e6f7d69d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Racute" format="2">
-  <advance width="633"/>
+  <advance width="641"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
-    <component base="acutecomb.case" xOffset="225"/>
+    <component base="acutecomb.case" xOffset="229"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_caron.glif b/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
index 16e9976f..2c96e419 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcaron" format="2">
-  <advance width="633"/>
+  <advance width="641"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
-    <component base="caroncomb.case" xOffset="129"/>
+    <component base="caroncomb.case" xOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
index cd7c6099..8f5d39f1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcommaaccent" format="2">
-  <advance width="633"/>
+  <advance width="641"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
-    <component base="commaaccentcomb" xOffset="147"/>
+    <component base="commaaccentcomb" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
index 3d963115..3e63b1b3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdblgrave" format="2">
-  <advance width="633"/>
+  <advance width="641"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
-    <component base="dblgravecomb.case" xOffset="92"/>
+    <component base="dblgravecomb.case" xOffset="96"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
index 7c3f7ce1..162c21b0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdotbelow" format="2">
-  <advance width="633"/>
+  <advance width="641"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
-    <component base="dotbelowcomb" xOffset="177"/>
+    <component base="dotbelowcomb" xOffset="181"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
index d344b39a..8dfd0c21 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rinvertedbreve" format="2">
-  <advance width="633"/>
+  <advance width="641"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
-    <component base="breveinvertedcomb.case" xOffset="116"/>
+    <component base="breveinvertedcomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
index 3bff79ca..64b450e5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rlinebelow" format="2">
-  <advance width="633"/>
+  <advance width="641"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
-    <component base="macronbelowcomb" xOffset="68"/>
+    <component base="macronbelowcomb" xOffset="72"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_.glif b/src/Cantarell-Regular.ufo/glyphs/S_.glif
index 51d0698a..7c606c62 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="S" format="2">
-  <advance width="577"/>
+  <advance width="590"/>
   <unicode hex="0053"/>
   <note>
 S
 </note>
-  <anchor x="285" y="0" name="bottom"/>
-  <anchor x="285" y="694" name="top"/>
+  <anchor x="292" y="0" name="bottom"/>
+  <anchor x="292" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="275" y="-10" type="curve" smooth="yes"/>
-      <point x="430" y="-10"/>
-      <point x="531" y="69"/>
-      <point x="531" y="191" type="curve" smooth="yes"/>
-      <point x="531" y="437"/>
-      <point x="142" y="339"/>
-      <point x="142" y="518" type="curve" smooth="yes"/>
-      <point x="142" y="591"/>
-      <point x="201" y="631"/>
-      <point x="307" y="631" type="curve" smooth="yes"/>
-      <point x="366" y="631"/>
-      <point x="430" y="619"/>
-      <point x="480" y="598" type="curve"/>
-      <point x="505" y="663" type="line"/>
-      <point x="446" y="689"/>
-      <point x="379" y="703"/>
-      <point x="313" y="703" type="curve" smooth="yes"/>
-      <point x="158" y="703"/>
-      <point x="57" y="626"/>
-      <point x="57" y="505" type="curve" smooth="yes"/>
-      <point x="57" y="267"/>
-      <point x="445" y="356"/>
-      <point x="445" y="179" type="curve" smooth="yes"/>
-      <point x="445" y="109"/>
-      <point x="385" y="64"/>
-      <point x="280" y="64" type="curve" smooth="yes"/>
-      <point x="217" y="64"/>
-      <point x="139" y="81"/>
-      <point x="71" y="109" type="curve"/>
-      <point x="46" y="44" type="line"/>
-      <point x="123" y="9"/>
-      <point x="201" y="-10"/>
+      <point x="282" y="-10" type="curve" smooth="yes"/>
+      <point x="437" y="-10"/>
+      <point x="538" y="69"/>
+      <point x="538" y="191" type="curve" smooth="yes"/>
+      <point x="538" y="437"/>
+      <point x="149" y="339"/>
+      <point x="149" y="518" type="curve" smooth="yes"/>
+      <point x="149" y="591"/>
+      <point x="208" y="631"/>
+      <point x="314" y="631" type="curve" smooth="yes"/>
+      <point x="373" y="631"/>
+      <point x="437" y="619"/>
+      <point x="487" y="598" type="curve"/>
+      <point x="512" y="663" type="line"/>
+      <point x="453" y="689"/>
+      <point x="386" y="703"/>
+      <point x="320" y="703" type="curve" smooth="yes"/>
+      <point x="165" y="703"/>
+      <point x="64" y="626"/>
+      <point x="64" y="505" type="curve" smooth="yes"/>
+      <point x="64" y="267"/>
+      <point x="452" y="356"/>
+      <point x="452" y="179" type="curve" smooth="yes"/>
+      <point x="452" y="109"/>
+      <point x="392" y="64"/>
+      <point x="287" y="64" type="curve" smooth="yes"/>
+      <point x="224" y="64"/>
+      <point x="146" y="81"/>
+      <point x="78" y="109" type="curve"/>
+      <point x="53" y="44" type="line"/>
+      <point x="130" y="9"/>
+      <point x="208" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_acute.glif b/src/Cantarell-Regular.ufo/glyphs/S_acute.glif
index 47976fd7..0aad3311 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacute" format="2">
-  <advance width="577"/>
+  <advance width="590"/>
   <unicode hex="015A"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="197"/>
+    <component base="acutecomb.case" xOffset="204"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
index e2e27301..bf6dcd8a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacutedotaccent" format="2">
-  <advance width="577"/>
+  <advance width="590"/>
   <unicode hex="1E64"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="197"/>
-    <component base="dotaccentcomb.case" xOffset="100" yOffset="107"/>
+    <component base="acutecomb.case" xOffset="204"/>
+    <component base="dotaccentcomb.case" xOffset="107" yOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_caron.glif b/src/Cantarell-Regular.ufo/glyphs/S_caron.glif
index c9e96a29..0bc1b658 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scaron" format="2">
-  <advance width="577"/>
+  <advance width="590"/>
   <unicode hex="0160"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="101"/>
+    <component base="caroncomb.case" xOffset="108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
index e14c32f9..2f8c1cdf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scarondotaccent" format="2">
-  <advance width="577"/>
+  <advance width="590"/>
   <unicode hex="1E66"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="101"/>
-    <component base="dotaccentcomb.case" xOffset="149" yOffset="142"/>
+    <component base="caroncomb.case" xOffset="108"/>
+    <component base="dotaccentcomb.case" xOffset="156" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif
index c876d6d5..d6924620 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scedilla" format="2">
-  <advance width="577"/>
+  <advance width="590"/>
   <unicode hex="015E"/>
   <outline>
     <component base="S"/>
-    <component base="cedillacomb" xOffset="138"/>
+    <component base="cedillacomb" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
index 72fcb712..cf8f2b91 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scircumflex" format="2">
-  <advance width="577"/>
+  <advance width="590"/>
   <unicode hex="015C"/>
   <outline>
     <component base="S"/>
-    <component base="circumflexcomb.case" xOffset="97"/>
+    <component base="circumflexcomb.case" xOffset="104"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
index 716f5718..4d62585b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scommaaccent" format="2">
-  <advance width="577"/>
+  <advance width="590"/>
   <unicode hex="0218"/>
   <outline>
     <component base="S"/>
-    <component base="commaaccentcomb" xOffset="119"/>
+    <component base="commaaccentcomb" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
index bb1d07d0..54af1bc1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotaccent" format="2">
-  <advance width="577"/>
+  <advance width="590"/>
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccentcomb.case" xOffset="149"/>
+    <component base="dotaccentcomb.case" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
index dbf444be..a6c6e817 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelow" format="2">
-  <advance width="577"/>
+  <advance width="590"/>
   <unicode hex="1E62"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
index 13bc5a50..3054690a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelowdotaccent" format="2">
-  <advance width="577"/>
+  <advance width="590"/>
   <unicode hex="1E68"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="149"/>
-    <component base="dotaccentcomb.case" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="156"/>
+    <component base="dotaccentcomb.case" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_horn.glif b/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
index 3718ed8b..3cae8ac1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Thorn" format="2">
-  <advance width="602"/>
+  <advance width="610"/>
   <unicode hex="00DE"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="183" y="0" type="line"/>
+      <point x="183" y="694" type="line"/>
+      <point x="100" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="149" y="139" type="line"/>
-      <point x="302" y="139" type="line" smooth="yes"/>
-      <point x="455" y="139"/>
-      <point x="556" y="229"/>
-      <point x="556" y="365" type="curve" smooth="yes"/>
-      <point x="556" y="499"/>
-      <point x="457" y="591"/>
-      <point x="312" y="591" type="curve" smooth="yes"/>
-      <point x="149" y="591" type="line"/>
-      <point x="149" y="519" type="line"/>
-      <point x="302" y="519" type="line" smooth="yes"/>
-      <point x="406" y="519"/>
-      <point x="471" y="456"/>
-      <point x="471" y="355" type="curve" smooth="yes"/>
-      <point x="471" y="261"/>
-      <point x="415" y="211"/>
-      <point x="312" y="211" type="curve" smooth="yes"/>
-      <point x="149" y="211" type="line"/>
+      <point x="153" y="139" type="line"/>
+      <point x="306" y="139" type="line" smooth="yes"/>
+      <point x="459" y="139"/>
+      <point x="560" y="229"/>
+      <point x="560" y="365" type="curve" smooth="yes"/>
+      <point x="560" y="499"/>
+      <point x="461" y="591"/>
+      <point x="316" y="591" type="curve" smooth="yes"/>
+      <point x="153" y="591" type="line"/>
+      <point x="153" y="519" type="line"/>
+      <point x="306" y="519" type="line" smooth="yes"/>
+      <point x="410" y="519"/>
+      <point x="475" y="456"/>
+      <point x="475" y="355" type="curve" smooth="yes"/>
+      <point x="475" y="261"/>
+      <point x="419" y="211"/>
+      <point x="316" y="211" type="curve" smooth="yes"/>
+      <point x="153" y="211" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_.glif b/src/Cantarell-Regular.ufo/glyphs/U_.glif
index 0ac55e4f..8474d71b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="0055"/>
   <note>
 U
 </note>
-  <anchor x="347" y="0" name="bottom"/>
-  <anchor x="441" y="10" name="ogonek"/>
-  <anchor x="347" y="694" name="top"/>
-  <anchor x="682" y="694" name="topright"/>
+  <anchor x="351" y="0" name="bottom"/>
+  <anchor x="445" y="10" name="ogonek"/>
+  <anchor x="351" y="694" name="top"/>
+  <anchor x="686" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="342" y="-10" type="curve" smooth="yes"/>
-      <point x="503" y="-10"/>
-      <point x="611" y="92"/>
-      <point x="611" y="246" type="curve" smooth="yes"/>
-      <point x="611" y="694" type="line"/>
-      <point x="530" y="694" type="line"/>
-      <point x="530" y="236" type="line" smooth="yes"/>
-      <point x="530" y="127"/>
-      <point x="465" y="63"/>
-      <point x="353" y="63" type="curve" smooth="yes"/>
-      <point x="235" y="63"/>
-      <point x="167" y="133"/>
-      <point x="167" y="253" type="curve" smooth="yes"/>
-      <point x="167" y="694" type="line"/>
-      <point x="84" y="694" type="line"/>
-      <point x="84" y="243" type="line" smooth="yes"/>
-      <point x="84" y="90"/>
-      <point x="185" y="-10"/>
+      <point x="346" y="-10" type="curve" smooth="yes"/>
+      <point x="507" y="-10"/>
+      <point x="615" y="92"/>
+      <point x="615" y="246" type="curve" smooth="yes"/>
+      <point x="615" y="694" type="line"/>
+      <point x="534" y="694" type="line"/>
+      <point x="534" y="236" type="line" smooth="yes"/>
+      <point x="534" y="127"/>
+      <point x="469" y="63"/>
+      <point x="357" y="63" type="curve" smooth="yes"/>
+      <point x="239" y="63"/>
+      <point x="171" y="133"/>
+      <point x="171" y="253" type="curve" smooth="yes"/>
+      <point x="171" y="694" type="line"/>
+      <point x="88" y="694" type="line"/>
+      <point x="88" y="243" type="line" smooth="yes"/>
+      <point x="88" y="90"/>
+      <point x="189" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_acute.glif b/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
index ea41ca6a..920c5c82 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uacute" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="00DA"/>
   <outline>
     <component base="U"/>
-    <component base="acutecomb.case" xOffset="259"/>
+    <component base="acutecomb.case" xOffset="263"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_breve.glif b/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
index 61c28754..b7f3d157 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ubreve" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="016C"/>
   <outline>
     <component base="U"/>
-    <component base="brevecomb.case" xOffset="138"/>
+    <component base="brevecomb.case" xOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_caron.glif b/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
index 3f57b6c2..94db86fb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucaron" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="01D3"/>
   <outline>
     <component base="U"/>
-    <component base="caroncomb.case" xOffset="163"/>
+    <component base="caroncomb.case" xOffset="167"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
index 5372fec4..bf4988df 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucircumflex" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="00DB"/>
   <outline>
     <component base="U"/>
-    <component base="circumflexcomb.case" xOffset="159"/>
+    <component base="circumflexcomb.case" xOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
index fab8c35f..05bc4c42 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udblgrave" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="0214"/>
   <outline>
     <component base="U"/>
-    <component base="dblgravecomb.case" xOffset="126"/>
+    <component base="dblgravecomb.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
index bf4b557e..9fcc85a5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="111"/>
+    <component base="dieresiscomb.case" xOffset="115"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
index 647653ea..bafefae8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisacute" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="01D7"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="111"/>
-    <component base="acutecomb.case" xOffset="259" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="115"/>
+    <component base="acutecomb.case" xOffset="263" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif
index e30dd5e2..a66fd414 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresiscaron" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="01D9"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="111"/>
-    <component base="caroncomb.case" xOffset="163" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="115"/>
+    <component base="caroncomb.case" xOffset="167" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif
index 787ff150..68c83fe1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisgrave" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="01DB"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="111"/>
-    <component base="gravecomb.case" xOffset="152" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="115"/>
+    <component base="gravecomb.case" xOffset="156" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif
index 411c00a1..29fd0884 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresismacron" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="01D5"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="111"/>
-    <component base="macroncomb.case" xOffset="105" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="115"/>
+    <component base="macroncomb.case" xOffset="109" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif
index 869817d5..aac08854 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udotbelow" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="1EE4"/>
   <outline>
     <component base="U"/>
-    <component base="dotbelowcomb" xOffset="211"/>
+    <component base="dotbelowcomb" xOffset="215"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_grave.glif b/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
index b4507b73..15cdb7bc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ugrave" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="00D9"/>
   <outline>
     <component base="U"/>
-    <component base="gravecomb.case" xOffset="152"/>
+    <component base="gravecomb.case" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
index b3cb191f..53b48287 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhookabove" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="1EE6"/>
   <outline>
     <component base="U"/>
-    <component base="hookabovecomb.case" xOffset="203"/>
+    <component base="hookabovecomb.case" xOffset="207"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horn.glif b/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
index fc4a353c..1bf2b6f5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorn" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="01AF"/>
   <outline>
     <component base="U"/>
-    <component base="horncomb" xOffset="540" yOffset="212"/>
+    <component base="horncomb" xOffset="544" yOffset="212"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif
index de6d90bc..8e8ab67d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornacute" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="1EE8"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="acutecomb.case" xOffset="259"/>
+    <component base="acutecomb.case" xOffset="263"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
index c240cd4d..5b747464 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorndotbelow" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="1EF0"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="dotbelowcomb" xOffset="211"/>
+    <component base="dotbelowcomb" xOffset="215"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
index e2716e65..7e7ad732 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorngrave" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="1EEA"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="gravecomb.case" xOffset="152"/>
+    <component base="gravecomb.case" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
index be8dff6d..14935617 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornhookabove" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="1EEC"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="hookabovecomb.case" xOffset="203"/>
+    <component base="hookabovecomb.case" xOffset="207"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
index 546f4cd4..2f1889ff 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorntilde" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="1EEE"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="tildecomb.case" xOffset="107"/>
+    <component base="tildecomb.case" xOffset="111"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
index 556de310..1b12183d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="0170"/>
   <outline>
     <component base="U"/>
-    <component base="hungarumlautcomb.case" xOffset="137"/>
+    <component base="hungarumlautcomb.case" xOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
index ded5ed9c..0b8ddbd9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uinvertedbreve" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="0216"/>
   <outline>
     <component base="U"/>
-    <component base="breveinvertedcomb.case" xOffset="150"/>
+    <component base="breveinvertedcomb.case" xOffset="154"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_macron.glif b/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
index 8c9933b0..c3738a0e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="016A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="105"/>
+    <component base="macroncomb.case" xOffset="109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
index e92e33be..4d609b27 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacrondieresis" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="1E7A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="105"/>
-    <component base="dieresiscomb.case" xOffset="111" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="109"/>
+    <component base="dieresiscomb.case" xOffset="115" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif
index 7a471f99..7eae54b8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uogonek" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="0172"/>
   <outline>
     <component base="U"/>
-    <component base="ogonekcomb.tall.case" xOffset="9"/>
+    <component base="ogonekcomb.tall.case" xOffset="13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_ring.glif b/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
index fefd6c0c..4c37b646 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uring" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="016E"/>
   <outline>
     <component base="U"/>
-    <component base="ringcomb.case" xOffset="174"/>
+    <component base="ringcomb.case" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif
index 0da39366..c2c1d8f7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraight-cy" format="2">
-  <advance width="598"/>
+  <advance width="604"/>
   <unicode hex="04AE"/>
   <anchor x="310" y="271" name="center"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif
index 292c1f23..86416938 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraightstroke-cy" format="2">
-  <advance width="598"/>
+  <advance width="604"/>
   <unicode hex="04B0"/>
   <outline>
     <component base="Ustraight-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif
index 18cb25d3..44237d9b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utilde" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="0168"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="107"/>
+    <component base="tildecomb.case" xOffset="111"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
index 1440e7e3..8f6bab5e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utildeacute" format="2">
-  <advance width="694"/>
+  <advance width="702"/>
   <unicode hex="1E78"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="107"/>
-    <component base="acutecomb.case" xOffset="260" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="111"/>
+    <component base="acutecomb.case" xOffset="264" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/V_.glif b/src/Cantarell-Regular.ufo/glyphs/V_.glif
index 272b44ce..7e308520 100644
--- a/src/Cantarell-Regular.ufo/glyphs/V_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/V_.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="V" format="2">
-  <advance width="637"/>
+  <advance width="627"/>
   <unicode hex="0056"/>
   <note>
 V
 </note>
-  <anchor x="319" y="0" name="bottom"/>
-  <anchor x="319" y="694" name="top"/>
+  <anchor x="314" y="0" name="bottom"/>
+  <anchor x="314" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="278" y="0" type="line"/>
-      <point x="359" y="0" type="line"/>
-      <point x="612" y="694" type="line"/>
-      <point x="528" y="694" type="line"/>
-      <point x="297" y="29" type="line"/>
-      <point x="347" y="29" type="line"/>
-      <point x="120" y="694" type="line"/>
-      <point x="25" y="694" type="line"/>
+      <point x="273" y="0" type="line"/>
+      <point x="354" y="0" type="line"/>
+      <point x="607" y="694" type="line"/>
+      <point x="523" y="694" type="line"/>
+      <point x="292" y="29" type="line"/>
+      <point x="342" y="29" type="line"/>
+      <point x="115" y="694" type="line"/>
+      <point x="20" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
index c4482295..b902c467 100644
--- a/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ve-cy" format="2">
-  <advance width="640"/>
+  <advance width="648"/>
   <unicode hex="0412"/>
   <outline>
     <component base="B"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_.glif b/src/Cantarell-Regular.ufo/glyphs/W_.glif
index 32b1f8d4..1ce62716 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="W" format="2">
-  <advance width="1016"/>
+  <advance width="1026"/>
   <unicode hex="0057"/>
   <note>
 W
 </note>
-  <anchor x="505" y="0" name="bottom"/>
-  <anchor x="505" y="694" name="top"/>
+  <anchor x="510" y="0" name="bottom"/>
+  <anchor x="510" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="249" y="0" type="line"/>
-      <point x="332" y="0" type="line"/>
-      <point x="524" y="653" type="line"/>
-      <point x="482" y="653" type="line"/>
-      <point x="690" y="0" type="line"/>
-      <point x="770" y="0" type="line"/>
-      <point x="986" y="694" type="line"/>
-      <point x="903" y="694" type="line"/>
-      <point x="711" y="39" type="line"/>
-      <point x="756" y="39" type="line"/>
-      <point x="555" y="689" type="line"/>
-      <point x="462" y="689" type="line"/>
-      <point x="273" y="39" type="line"/>
-      <point x="313" y="39" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="30" y="694" type="line"/>
+      <point x="254" y="0" type="line"/>
+      <point x="337" y="0" type="line"/>
+      <point x="529" y="653" type="line"/>
+      <point x="487" y="653" type="line"/>
+      <point x="695" y="0" type="line"/>
+      <point x="775" y="0" type="line"/>
+      <point x="991" y="694" type="line"/>
+      <point x="908" y="694" type="line"/>
+      <point x="716" y="39" type="line"/>
+      <point x="761" y="39" type="line"/>
+      <point x="560" y="689" type="line"/>
+      <point x="467" y="689" type="line"/>
+      <point x="278" y="39" type="line"/>
+      <point x="318" y="39" type="line"/>
+      <point x="131" y="694" type="line"/>
+      <point x="35" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_acute.glif b/src/Cantarell-Regular.ufo/glyphs/W_acute.glif
index d364f896..e39ac7bf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wacute" format="2">
-  <advance width="1016"/>
+  <advance width="1026"/>
   <unicode hex="1E82"/>
   <outline>
     <component base="W"/>
-    <component base="acutecomb.case" xOffset="417"/>
+    <component base="acutecomb.case" xOffset="422"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif
index 1dbff283..67e55e2f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wcircumflex" format="2">
-  <advance width="1016"/>
+  <advance width="1026"/>
   <unicode hex="0174"/>
   <outline>
     <component base="W"/>
-    <component base="circumflexcomb.case" xOffset="317"/>
+    <component base="circumflexcomb.case" xOffset="322"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif
index bc4e7f0d..13afdd30 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wdieresis" format="2">
-  <advance width="1016"/>
+  <advance width="1026"/>
   <unicode hex="1E84"/>
   <outline>
     <component base="W"/>
-    <component base="dieresiscomb.case" xOffset="269"/>
+    <component base="dieresiscomb.case" xOffset="274"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif
index 3cff651e..f4340797 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="We-cy" format="2">
-  <advance width="1016"/>
+  <advance width="1026"/>
   <unicode hex="051C"/>
   <outline>
     <component base="W"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_grave.glif b/src/Cantarell-Regular.ufo/glyphs/W_grave.glif
index baa87ad2..8d707bf8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wgrave" format="2">
-  <advance width="1016"/>
+  <advance width="1026"/>
   <unicode hex="1E80"/>
   <outline>
     <component base="W"/>
-    <component base="gravecomb.case" xOffset="310"/>
+    <component base="gravecomb.case" xOffset="315"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/X_.glif b/src/Cantarell-Regular.ufo/glyphs/X_.glif
index 4679e6a0..9a0c174b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/X_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/X_.glif
@@ -1,32 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="X" format="2">
-  <advance width="643"/>
+  <advance width="651"/>
   <unicode hex="0058"/>
   <note>
 X
 </note>
-  <anchor x="322" y="0" name="bottom"/>
-  <anchor x="322" y="694" name="top"/>
+  <anchor x="326" y="0" name="bottom"/>
+  <anchor x="326" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="516" y="0" type="line"/>
-      <point x="615" y="0" type="line"/>
-      <point x="350" y="383" type="line"/>
-      <point x="148" y="694" type="line"/>
-      <point x="49" y="694" type="line"/>
-      <point x="294" y="331" type="line"/>
+      <point x="520" y="0" type="line"/>
+      <point x="619" y="0" type="line"/>
+      <point x="354" y="383" type="line"/>
+      <point x="152" y="694" type="line"/>
+      <point x="53" y="694" type="line"/>
+      <point x="298" y="331" type="line"/>
     </contour>
     <contour>
-      <point x="29" y="0" type="line"/>
-      <point x="123" y="0" type="line"/>
-      <point x="326" y="309" type="line"/>
-      <point x="283" y="373" type="line"/>
+      <point x="33" y="0" type="line"/>
+      <point x="127" y="0" type="line"/>
+      <point x="330" y="309" type="line"/>
+      <point x="287" y="373" type="line"/>
     </contour>
     <contour>
-      <point x="354" y="351" type="line"/>
-      <point x="589" y="694" type="line"/>
-      <point x="495" y="694" type="line"/>
-      <point x="311" y="415" type="line"/>
+      <point x="358" y="351" type="line"/>
+      <point x="593" y="694" type="line"/>
+      <point x="499" y="694" type="line"/>
+      <point x="315" y="415" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_.glif b/src/Cantarell-Regular.ufo/glyphs/Y_.glif
index edf0ac62..c4a7597b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Y" format="2">
-  <advance width="598"/>
+  <advance width="604"/>
   <unicode hex="0059"/>
   <note>
 Y
 </note>
-  <anchor x="305" y="0" name="bottom"/>
-  <anchor x="305" y="694" name="top"/>
-  <anchor x="27" y="694" name="topleft"/>
+  <anchor x="308" y="0" name="bottom"/>
+  <anchor x="308" y="694" name="top"/>
+  <anchor x="30" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="260" y="0" type="line"/>
-      <point x="343" y="0" type="line"/>
-      <point x="343" y="299" type="line"/>
-      <point x="583" y="694" type="line"/>
-      <point x="492" y="694" type="line"/>
-      <point x="299" y="362" type="line"/>
-      <point x="310" y="362" type="line"/>
-      <point x="112" y="694" type="line"/>
-      <point x="15" y="694" type="line"/>
-      <point x="260" y="299" type="line"/>
+      <point x="263" y="0" type="line"/>
+      <point x="346" y="0" type="line"/>
+      <point x="346" y="299" type="line"/>
+      <point x="586" y="694" type="line"/>
+      <point x="495" y="694" type="line"/>
+      <point x="302" y="362" type="line"/>
+      <point x="313" y="362" type="line"/>
+      <point x="115" y="694" type="line"/>
+      <point x="18" y="694" type="line"/>
+      <point x="263" y="299" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif b/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
index f739e0b5..ac4759ac 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yacute" format="2">
-  <advance width="598"/>
+  <advance width="604"/>
   <unicode hex="00DD"/>
   <outline>
     <component base="Y"/>
-    <component base="acutecomb.case" xOffset="217"/>
+    <component base="acutecomb.case" xOffset="220"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
index 99ba6b00..4b16a797 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ycircumflex" format="2">
-  <advance width="598"/>
+  <advance width="604"/>
   <unicode hex="0176"/>
   <outline>
     <component base="Y"/>
-    <component base="circumflexcomb.case" xOffset="117"/>
+    <component base="circumflexcomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
index d76b7d39..9fd386b4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydieresis" format="2">
-  <advance width="598"/>
+  <advance width="604"/>
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
-    <component base="dieresiscomb.case" xOffset="69"/>
+    <component base="dieresiscomb.case" xOffset="72"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
index 7cdb7722..32973ee2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotaccent" format="2">
-  <advance width="598"/>
+  <advance width="604"/>
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
-    <component base="dotaccentcomb.case" xOffset="169"/>
+    <component base="dotaccentcomb.case" xOffset="172"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
index 8d91e821..eff2bde5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotbelow" format="2">
-  <advance width="598"/>
+  <advance width="604"/>
   <unicode hex="1EF4"/>
   <outline>
     <component base="Y"/>
-    <component base="dotbelowcomb" xOffset="169"/>
+    <component base="dotbelowcomb" xOffset="172"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif b/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
index 2170491f..f994927f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ygrave" format="2">
-  <advance width="598"/>
+  <advance width="604"/>
   <unicode hex="1EF2"/>
   <outline>
     <component base="Y"/>
-    <component base="gravecomb.case" xOffset="110"/>
+    <component base="gravecomb.case" xOffset="113"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
index c5da57b8..968d6e72 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yhookabove" format="2">
-  <advance width="598"/>
+  <advance width="604"/>
   <unicode hex="1EF6"/>
   <outline>
     <component base="Y"/>
-    <component base="hookabovecomb.case" xOffset="161"/>
+    <component base="hookabovecomb.case" xOffset="164"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif
index 268238a2..eb7d92e6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yi-cy" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="0407"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-98"/>
+    <component base="dieresiscomb.case" xOffset="-94"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif b/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
index 8bbda1ed..45a2785c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ymacron" format="2">
-  <advance width="598"/>
+  <advance width="604"/>
   <unicode hex="0232"/>
   <outline>
     <component base="Y"/>
-    <component base="macroncomb.case" xOffset="63"/>
+    <component base="macroncomb.case" xOffset="66"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
index fee72a07..a19cf965 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ytilde" format="2">
-  <advance width="598"/>
+  <advance width="604"/>
   <unicode hex="1EF8"/>
   <outline>
     <component base="Y"/>
-    <component base="tildecomb.case" xOffset="65"/>
+    <component base="tildecomb.case" xOffset="68"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_.glif b/src/Cantarell-Regular.ufo/glyphs/Z_.glif
index 4cc4119d..4cdf33d1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_.glif
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Z" format="2">
-  <advance width="638"/>
+  <advance width="646"/>
   <unicode hex="005A"/>
   <note>
 Z
 </note>
-  <anchor x="319" y="0" name="bottom"/>
-  <anchor x="319" y="694" name="top"/>
+  <anchor x="323" y="0" name="bottom"/>
+  <anchor x="323" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="40" y="0" type="line"/>
-      <point x="598" y="0" type="line"/>
-      <point x="598" y="72" type="line"/>
-      <point x="118" y="72" type="line"/>
-      <point x="130" y="47" type="line"/>
-      <point x="585" y="642" type="line"/>
-      <point x="585" y="694" type="line"/>
-      <point x="54" y="694" type="line"/>
-      <point x="54" y="622" type="line"/>
-      <point x="506" y="622" type="line"/>
-      <point x="494" y="647" type="line"/>
-      <point x="40" y="53" type="line"/>
+      <point x="44" y="0" type="line"/>
+      <point x="602" y="0" type="line"/>
+      <point x="602" y="72" type="line"/>
+      <point x="122" y="72" type="line"/>
+      <point x="134" y="47" type="line"/>
+      <point x="589" y="642" type="line"/>
+      <point x="589" y="694" type="line"/>
+      <point x="58" y="694" type="line"/>
+      <point x="58" y="622" type="line"/>
+      <point x="510" y="622" type="line"/>
+      <point x="498" y="647" type="line"/>
+      <point x="44" y="53" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif b/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
index 0ee2ba9f..7265d23e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zacute" format="2">
-  <advance width="638"/>
+  <advance width="646"/>
   <unicode hex="0179"/>
   <outline>
     <component base="Z"/>
-    <component base="acutecomb.case" xOffset="231"/>
+    <component base="acutecomb.case" xOffset="235"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif b/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
index 4d6fcc16..204de058 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zcaron" format="2">
-  <advance width="638"/>
+  <advance width="646"/>
   <unicode hex="017D"/>
   <outline>
     <component base="Z"/>
-    <component base="caroncomb.case" xOffset="135"/>
+    <component base="caroncomb.case" xOffset="139"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
index 92a8d900..dce351b1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotaccent" format="2">
-  <advance width="638"/>
+  <advance width="646"/>
   <unicode hex="017B"/>
   <outline>
     <component base="Z"/>
-    <component base="dotaccentcomb.case" xOffset="183"/>
+    <component base="dotaccentcomb.case" xOffset="187"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
index c531fc2f..602cfcc1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotbelow" format="2">
-  <advance width="638"/>
+  <advance width="646"/>
   <unicode hex="1E92"/>
   <outline>
     <component base="Z"/>
-    <component base="dotbelowcomb" xOffset="183"/>
+    <component base="dotbelowcomb" xOffset="187"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif
index e5155f06..782dd17f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="palochka-cy" format="2">
-  <advance width="275"/>
+  <advance width="283"/>
   <unicode hex="04CF"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell_autospace.py b/src/Cantarell_autospace.py
index 37297557..8e17dcac 100644
--- a/src/Cantarell_autospace.py
+++ b/src/Cantarell_autospace.py
@@ -4,7 +4,7 @@
 # Script, Category, Subcategory, value, referenceGlyph, filter
 
 # Letters
-*,Letter,Uppercase,1.15,H,*,
+*,Letter,Uppercase,1.2,H,*,
 *,Letter,Smallcaps,1.1,h.sc,*,
 *,Letter,Lowercase,1,x,*,
 *,Letter,Lowercase,0.7,m.sups,.sups,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]