workaround for bug in Safari where contextual sub in liga causes kerning to fail. Moves "r" ligature to calt to work around this bug.

1 files changed, 150 insertions, 151 deletions

diff --git a/src/Inter.glyphs b/src/Inter.glyphs
index 86130525c..e3e658943 100644
--- a/src/Inter.glyphs
+++ b/src/Inter.glyphs
@@ -1,5 +1,8 @@
 {
-.appVersion = "1208";
+.appVersion = "1209";
+DisplayStrings = (
+"@"
+);
 classes = (
 {
 automatic = 1;
@@ -2562,7 +2565,7 @@ code = "sub parenleft by parenleft.case;\012sub parenright by parenright.case;\0
 name = case;
 },
 {
-code = "# whitespace\012@SPACE = [\012  space nbspace uni202F uni205F enquad emquad enspace emspace thirdemspace\012  quarteremspace sixthemspace figurespace punctuationspace thinspace hairspace\012  zerowidthspace uni2009.fra\012];\012\012# numbers\012@NUM = [\012  zero one two twostroke three four five Tonefive six seven eight nine\012  zero.slash one.ss01 three.1 four.ss01 six.ss01 nine.ss01 zero.tf one.tf\012  two.tf three.tf four.tf five.tf six.tf seven.tf eight.tf nine.tf\012  zero.tf.slash one.tf.ss01 three.1.tf four.tf.ss01 six.tf.ss01 nine.tf.ss01\012];\012\012# cap-height tall glyphs\012@UC = [\012  @Uppercase\012  @NUM\012\012  # punctuation\012  ampersand exclam exclamdbl exclamdown uni2049 question uni2047 uni2048\012  questiondown interrobang invertedinterrobang bar paragraph\012\012  # currency\012  dollar cent yen sterling florin uni20BA uni20BD euro uni20B9 tenge peseta\012  peso kip won lira austral hryvnia naira guarani coloncurrency cedi cruzeiro\012  tugrik uni20AF mill afii57636 manat rupee lari franc\012];\012\012# x-height tall glyphs\012@LC = [\012  @Lowercase\012];\012\012@CASE_DELIM_L = [\012  braceleft   braceright\012  bracketleft bracketright\012  parenleft   parenright\012];\012@CASE_NONDELIM_L = [\012  asterisk\012  at\012  multiply\012  minus\012  plus\012  plusminus\012  divide\012  equal\012  notequal\012  endash\012  figuredash\012  emdash\012  hyphen\012  bullet\012  openbullet\012  hyphenbullet\012  trianglebullet\012  leftArrow\012  leftLongArrow\012  rightArrow\012  rightLongArrow\012  leftRightArrow\012  leftRightLongArrow\012  colon\012  approxequal\012  asciitilde\012  less\012  greater\012  lessequal\012  greaterequal\012];\012@CASE_L = [\012  @CASE_DELIM_L\012  @CASE_NONDELIM_L\012];\012\012@CASE_DELIM_R = [\012  braceleft.case   braceright.case\012  bracketleft.case bracketright.case\012  parenleft.case   parenright.case\012];\012@CASE_NONDELIM_R = [\012  asterisk.case\012  at.case\012  multiply.case\012  minus.case\012  plus.case\012  plusminus.case\012  divide.case\012  equal.case\012  notequal.case\012  endash.case\012  figuredash.case\012  emdash.case\012  hyphen.case\012  bullet.case\012  openbullet.case\012  hyphenbullet.case\012  trianglebullet.case\012  leftArrow.case\012  leftLongArrow.case\012  rightArrow.case\012  rightLongArrow.case\012  leftRightArrow.case\012  leftRightLongArrow.case\012  colon.case\012  approxequal.case\012  asciitilde.case\012  less.case\012  greater.case\012  lessequal.case\012  greaterequal.case\012];\012@CASE_R = [\012  @CASE_DELIM_R\012  @CASE_NONDELIM_R\012];\012\012@DASH = [\012  hyphen hyphen.case\012  endash endash.case\012  emdash emdash.case\012  minus minus.case\012];\012\012# ---------------------------------------------------\012\012# arrows: <-> <-->\012sub less hyphen greater by leftRightArrow;\012sub less hyphen.case greater by leftRightArrow.case;\012sub less [endash emdash] greater by leftRightLongArrow;\012sub less [endash.case emdash.case] greater by leftRightLongArrow.case;\012sub less hyphen hyphen greater by leftRightLongArrow;\012sub less hyphen.case hyphen.case greater by leftRightLongArrow.case;\012\012# arrows: -> -->\012sub hyphen greater by rightArrow;\012sub hyphen.case greater by rightArrow.case;\012sub [endash emdash] greater by rightLongArrow;\012sub [endash.case emdash.case] greater by rightLongArrow.case;\012\012# arrows: <- <--\012ignore sub less @DASH @NUM; # e.g. \"<-3\"\012sub less' hyphen' by leftArrow;\012sub less' hyphen.case' by leftArrow.case;\012sub less' [endash emdash]' by leftLongArrow;\012sub less' [endash.case emdash.case]' by leftLongArrow.case;\012\012# :-)\012sub colon' @DASH [parenright parenright.case] by colon.case;\012sub [colon colon.case] hyphen' [parenright parenright.case] by hyphen.case;\012sub [colon colon.case] endash' [parenright parenright.case] by endash.case;\012sub [colon colon.case] emdash' [parenright parenright.case] by emdash.case;\012sub [colon colon.case] @DASH parenright' by parenright.case;\012\012# A foo' -> A foo.case\012#\012# ignore subs adjacent to lower case\012#\012# e.g. \"x-\"\012# TODO: figure out how to ignore \"x--A\"\012ignore sub @LC @CASE_L;\012#\012# e.g. \"-x\", \"--x\", \"---x\", \"----x\", \"-----x\"\012ignore sub @CASE_L @LC;\012ignore sub @CASE_L @CASE_L @LC;\012ignore sub @CASE_L @CASE_L @CASE_L @LC;\012ignore sub @CASE_L @CASE_L @CASE_L @CASE_L @LC;\012ignore sub @CASE_L @CASE_L @CASE_L @CASE_L @CASE_L @LC;\012#\012# pairs with space, e.g. \"( ) M\" since we don't support subbing\012# all on the left side.\012ignore sub @CASE_DELIM_L @SPACE @CASE_DELIM_L @SPACE [ @UC @CASE_R ];\012#\012# e.g. \"A-\", \"A -\", \"A  -\"\012sub [ @UC @CASE_R ] @CASE_L' by @CASE_R;\012sub [ @UC @CASE_R ] @SPACE @CASE_L' by @CASE_R;\012sub [ @UC @CASE_R ] @SPACE @SPACE @CASE_L' by @CASE_R;\012\012# foo' foo foo foo foo A -> foo.case foo foo foo foo A\012# foo' foo foo foo A -> foo.case foo foo foo A\012# foo' foo foo A -> foo.case foo foo A\012# foo' foo A -> foo.case foo A\012# foo' A -> foo.case A\012# Note: since we look quite far back, sequences like x{}[]M will case both\012# the square brackets next to M _and_ the curly braces to become .case\012# \012# e.g. \"-A\", \"--A\", \"---A\", \"----A\", \"-----A\"\012sub @CASE_L' [ @UC @CASE_R ] by @CASE_R;\012sub @CASE_L' @CASE_L [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L @CASE_L [ @CASE_R @UC ] by @CASE_R;\012# \012# e.g. \"- A\", \"-- A\", \"--- A\", \"---- A\", \"----- A\"\012sub @CASE_L' @SPACE [ @UC @CASE_R ] by @CASE_R;\012sub @CASE_L' @CASE_L @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L @CASE_L @SPACE [ @CASE_R @UC ] by @CASE_R;\012# \012# e.g. \"-  A\", \"--  A\", \"---  A\", \"----  A\", \"-----  A\"\012sub @CASE_L' @SPACE @SPACE [ @UC @CASE_R ] by @CASE_R;\012sub @CASE_L' @CASE_L @SPACE @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @SPACE @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L @SPACE @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L @CASE_L @SPACE @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @SPACE @SPACE @SPACE [ @UC @CASE_R ] by @CASE_R; # e.g. \"-  A\"\012";
+code = "# whitespace\012@SPACE = [\012  space nbspace uni202F uni205F enquad emquad enspace emspace thirdemspace\012  quarteremspace sixthemspace figurespace punctuationspace thinspace hairspace\012  zerowidthspace uni2009.fra\012];\012\012# numbers\012@NUM = [\012  zero one two twostroke three four five Tonefive six seven eight nine\012  zero.slash one.ss01 three.1 four.ss01 six.ss01 nine.ss01 zero.tf one.tf\012  two.tf three.tf four.tf five.tf six.tf seven.tf eight.tf nine.tf\012  zero.tf.slash one.tf.ss01 three.1.tf four.tf.ss01 six.tf.ss01 nine.tf.ss01\012];\012\012# cap-height tall glyphs\012@UC = [\012  @Uppercase\012  @NUM\012\012  # punctuation\012  ampersand exclam exclamdbl exclamdown uni2049 question uni2047 uni2048\012  questiondown interrobang invertedinterrobang bar paragraph\012\012  # currency\012  dollar cent yen sterling florin uni20BA uni20BD euro uni20B9 tenge peseta\012  peso kip won lira austral hryvnia naira guarani coloncurrency cedi cruzeiro\012  tugrik uni20AF mill afii57636 manat rupee lari franc\012];\012\012# x-height tall glyphs\012@LC = [\012  @Lowercase\012];\012\012@CASE_DELIM_L = [\012  braceleft   braceright\012  bracketleft bracketright\012  parenleft   parenright\012];\012@CASE_NONDELIM_L = [\012  asterisk\012  at\012  multiply\012  minus\012  plus\012  plusminus\012  divide\012  equal\012  notequal\012  endash\012  figuredash\012  emdash\012  hyphen\012  bullet\012  openbullet\012  hyphenbullet\012  trianglebullet\012  leftArrow\012  leftLongArrow\012  rightArrow\012  rightLongArrow\012  leftRightArrow\012  leftRightLongArrow\012  colon\012  approxequal\012  asciitilde\012  less\012  greater\012  lessequal\012  greaterequal\012];\012@CASE_L = [\012  @CASE_DELIM_L\012  @CASE_NONDELIM_L\012];\012\012@CASE_DELIM_R = [\012  braceleft.case   braceright.case\012  bracketleft.case bracketright.case\012  parenleft.case   parenright.case\012];\012@CASE_NONDELIM_R = [\012  asterisk.case\012  at.case\012  multiply.case\012  minus.case\012  plus.case\012  plusminus.case\012  divide.case\012  equal.case\012  notequal.case\012  endash.case\012  figuredash.case\012  emdash.case\012  hyphen.case\012  bullet.case\012  openbullet.case\012  hyphenbullet.case\012  trianglebullet.case\012  leftArrow.case\012  leftLongArrow.case\012  rightArrow.case\012  rightLongArrow.case\012  leftRightArrow.case\012  leftRightLongArrow.case\012  colon.case\012  approxequal.case\012  asciitilde.case\012  less.case\012  greater.case\012  lessequal.case\012  greaterequal.case\012];\012@CASE_R = [\012  @CASE_DELIM_R\012  @CASE_NONDELIM_R\012];\012\012@DASH = [\012  hyphen hyphen.case\012  endash endash.case\012  emdash emdash.case\012  minus minus.case\012];\012\012# ---------------------------------------------------\012\012# arrows: <-> <-->\012sub less hyphen greater by leftRightArrow;\012sub less hyphen.case greater by leftRightArrow.case;\012sub less [endash emdash] greater by leftRightLongArrow;\012sub less [endash.case emdash.case] greater by leftRightLongArrow.case;\012sub less hyphen hyphen greater by leftRightLongArrow;\012sub less hyphen.case hyphen.case greater by leftRightLongArrow.case;\012\012# arrows: -> -->\012sub hyphen greater by rightArrow;\012sub hyphen.case greater by rightArrow.case;\012sub [endash emdash] greater by rightLongArrow;\012sub [endash.case emdash.case] greater by rightLongArrow.case;\012\012# arrows: <- <--\012ignore sub less @DASH @NUM; # e.g. \"<-3\"\012sub less' hyphen' by leftArrow;\012sub less' hyphen.case' by leftArrow.case;\012sub less' [endash emdash]' by leftLongArrow;\012sub less' [endash.case emdash.case]' by leftLongArrow.case;\012\012# :-)\012sub colon' @DASH [parenright parenright.case] by colon.case;\012sub [colon colon.case] hyphen' [parenright parenright.case] by hyphen.case;\012sub [colon colon.case] endash' [parenright parenright.case] by endash.case;\012sub [colon colon.case] emdash' [parenright parenright.case] by emdash.case;\012sub [colon colon.case] @DASH parenright' by parenright.case;\012\012# A foo' -> A foo.case\012#\012# ignore subs adjacent to lower case\012#\012# e.g. \"x-\"\012# TODO: figure out how to ignore \"x--A\"\012ignore sub @LC @CASE_L;\012#\012# e.g. \"-x\", \"--x\", \"---x\", \"----x\", \"-----x\"\012ignore sub @CASE_L @LC;\012ignore sub @CASE_L @CASE_L @LC;\012ignore sub @CASE_L @CASE_L @CASE_L @LC;\012ignore sub @CASE_L @CASE_L @CASE_L @CASE_L @LC;\012ignore sub @CASE_L @CASE_L @CASE_L @CASE_L @CASE_L @LC;\012#\012# pairs with space, e.g. \"( ) M\" since we don't support subbing\012# all on the left side.\012ignore sub @CASE_DELIM_L @SPACE @CASE_DELIM_L @SPACE [ @UC @CASE_R ];\012#\012# e.g. \"A-\", \"A -\", \"A  -\"\012sub [ @UC @CASE_R ] @CASE_L' by @CASE_R;\012sub [ @UC @CASE_R ] @SPACE @CASE_L' by @CASE_R;\012sub [ @UC @CASE_R ] @SPACE @SPACE @CASE_L' by @CASE_R;\012\012# foo' foo foo foo foo A -> foo.case foo foo foo foo A\012# foo' foo foo foo A -> foo.case foo foo foo A\012# foo' foo foo A -> foo.case foo foo A\012# foo' foo A -> foo.case foo A\012# foo' A -> foo.case A\012# Note: since we look quite far back, sequences like x{}[]M will case both\012# the square brackets next to M _and_ the curly braces to become .case\012# \012# e.g. \"-A\", \"--A\", \"---A\", \"----A\", \"-----A\"\012sub @CASE_L' [ @UC @CASE_R ] by @CASE_R;\012sub @CASE_L' @CASE_L [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L @CASE_L [ @CASE_R @UC ] by @CASE_R;\012# \012# e.g. \"- A\", \"-- A\", \"--- A\", \"---- A\", \"----- A\"\012sub @CASE_L' @SPACE [ @UC @CASE_R ] by @CASE_R;\012sub @CASE_L' @CASE_L @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L @CASE_L @SPACE [ @CASE_R @UC ] by @CASE_R;\012# \012# e.g. \"-  A\", \"--  A\", \"---  A\", \"----  A\", \"-----  A\"\012sub @CASE_L' @SPACE @SPACE [ @UC @CASE_R ] by @CASE_R;\012sub @CASE_L' @CASE_L @SPACE @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @SPACE @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L @SPACE @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @CASE_L @CASE_L @CASE_L @CASE_L @SPACE @SPACE [ @CASE_R @UC ] by @CASE_R;\012sub @CASE_L' @SPACE @SPACE @SPACE [ @UC @CASE_R ] by @CASE_R; # e.g. \"-  A\"\012\012# ---------------------------------------\012# r\012\012@r_A = [\012  r\012  rrthook\012  uni024D\012  rdescend\012  racute\012  rcommaaccent\012  rcaron\012  rdblgrave\012  rinvertedbreve\012  rdotaccent\012  rdotbelow\012  rdotbelowmacron\012  rlinebelow\012];\012@r_B = [\012  r.1\012  rrthook.1\012  uni024D.1\012  rdescend.1\012  racute.1\012  rcommaaccent.1\012  rcaron.1\012  rdblgrave.1\012  rinvertedbreve.1\012  rdotaccent.1\012  rdotbelow.1\012  rdotbelowmacron.1\012  rlinebelow.1\012];\012@f = [  # horizontal bar extending left\012  f fdotaccent\012  t tpalatalhook trthook tcurl tccurl tturn tbar tcommaaccent tcaron uni021B\012    tdotaccent tdotbelow tlinebelow tcircumflexbelow tdieresis\012  z zbar zhook uni0240 zrthook zacute zdotaccent zcaron zcircumflex zdotbelow\012    zlinebelow zcurl\012  pi tau\012  uni04FB kabashkircyrillic tecyrillic hardsigncyrillic tetsecyrillic\012];\012@n = [  # x-height vertical bar on left side\012  i idotless itildebelow uni1E2D.ccmp igrave iacute uni012F.ccmp iogonek\012    idotbelow uni1ECB.ccmp jdotless icyrillic ij\012  j jcrosstail.ccmp jcrosstail yotgreek jecyrillic\012  m mhook mturn mturndescend macute mdotaccent mdotbelow\012  n ntilde nrthook eng ncurl nlfthook nlegrightlong nacute ncommaaccent\012    ncaron uni01F9 ndotaccent ndotbelow nlinebelow ncircumflexbelow nj\012  r rrthook uni024D rdescend racute rcommaaccent rcaron rdblgrave\012    rinvertedbreve rdotaccent rdotbelow rdotbelowmacron rlinebelow r.1\012    rrthook.1 uni024D.1 rdescend.1 racute.1 rcommaaccent.1 rcaron.1 rdblgrave.1\012    rinvertedbreve.1 rdotaccent.1 rdotbelow.1 rdotbelowmacron.1 rlinebelow.1\012  u udieresis utilde uhorn micro ubar ugrave uacute ucircumflex umacron ubreve\012    uring uhungarumlaut uogonek ucaron udieresismacron udieresisacute\012    udieresiscaron udieresisgrave udblgrave uinvertedbreve udieresisbelow\012    utildebelow ucircumflexbelow utildeacute umacrondieresis udotbelow\012    uhookabove uhornacute uhorngrave uhornhookabove uhorntilde uhorndotbelow\012  eta etatonos uni1F20 uni1F21 uni1F22 uni1F23 uni1F24 uni1F25 uni1F26\012    uni1F27 uni1F74 uni1F90 uni1F91 uni1F92 uni1F93 uni1F94 uni1F95 uni1F96\012    uni1F97 uni1FC2 uni1FC3 uni1FC4 uni1FC6 uni1FC7\012  iota iotadieresistonos iotatonos iotadieresis uni1F30 uni1F31 uni1F32\012    uni1F33 uni1F34 uni1F35 uni1F36 uni1F37 uni1F76 uni1FD0 uni1FD1 uni1FD2\012    uni1FD6 uni1FD7\012  upsilon upsilondieresistonos upsilondieresis upsilontonos uni1F50 uni1F51\012    uni1F52 uni1F53 uni1F54 uni1F55 uni1F56 uni1F57 uni1F7A uni1FE0 uni1FE1\012    uni1FE2 uni1FE6 uni1FE7\012  psi\012  vecyrillic gecyrillic gheupturncyrillic iicyrillic uni048B kacyrillic\012    kahookcyrillic kadescendercyrillic kaverticalstrokecyrillic emcyrillic\012    uni04CE encyrillic endescendercyrillic enghecyrillic enhookcyrillic\012    uni04CA pecyrillic tsecyrillic dzhecyrillic shacyrillic shchacyrillic\012    softsigncyrillic yericyrillic njecyrillic iucyrillic ghemiddlehookcyrillic\012    pemiddlehookcyrillic\012];\012@v = [  # diagonal bar extending top left\012  v vtilde vdotbelow\012  w wdieresis wturn wcircumflex wgrave wacute wdotaccent wdotbelow wring\012  x xdotaccent xdieresis khacyrillic\012  y ydieresis yhook uni024F yacute ycircumflex uni0233 ydotaccent yring\012    ygrave ydotbelow yhookabove ytilde ucyrillic ushortcyrillic umacroncyrillic\012    udieresiscyrillic uhungarumlautcyrillic\012  gamma1\012  zhecyrillic zhedescendercyrillic uni04FD hadescendercyrillic\012    cheabkhasiancyrillic izhitsacyrillic\012];\012\012@one = [ one one.ss01 one.tf one.tf.ss01 ];\012@top_quote = [ quoteleft quoteright quotesingle quotedbl quotedblleft quotedblright ];\012\012@sups = [ a.sups b.sups c.sups d.sups e.sups f.sups g.sups h.sups i.sups j.sups k.sups l.sups m.sups n.sups o.sups p.sups q.sups r.sups s.sups t.sups u.sups v.sups w.sups x.sups y.sups z.sups zero.sups one.sups two.sups three.sups four.sups five.sups six.sups seven.sups eight.sups nine.sups parenleft.sups parenright.sups plus.sups minus.sups equal.sups zero.numr one.numr two.numr three.numr four.numr five.numr six.numr seven.numr eight.numr nine.numr plus.numr minus.numr equal.numr parenleft.numr parenright.numr zero.frac one.frac two.frac three.frac four.frac five.frac six.frac seven.frac eight.frac nine.frac ];\012\012@frac = [ onehalf onethird onequarter threequarters fivesixths onefraction seveneighths oneeighth fiveeighths threeeighths uni214D cadauna careof accountof addresssubject ];\012\012# Replace \"r\" with \"r.1\" when it preceeds glyphs with things\012# extending leftwards to the tail of the r.\012# This breaks the glyphs up better, increasing legibility.\012sub @r_A' [ @f @n @v @one @top_quote @sups @frac kturn ] by @r_B;\012";
 name = calt;
 },
 {
@@ -2585,10 +2588,6 @@ name = cpsp;
 notes = "The first two numbers (16 and 0) are the x and y amounts by which a glyph is moved. The second pair of numbers (32 and 0) is the advance, meaning that the cursor will be placed 32 units further in this case. Effectively, this adds 16 units on each side (or 32 between all uppercase letters)";
 },
 {
-code = "@r_A = [\012  r\012  rrthook\012  uni024D\012  rdescend\012  racute\012  rcommaaccent\012  rcaron\012  rdblgrave\012  rinvertedbreve\012  rdotaccent\012  rdotbelow\012  rdotbelowmacron\012  rlinebelow\012];\012@r_B = [\012  r.1\012  rrthook.1\012  uni024D.1\012  rdescend.1\012  racute.1\012  rcommaaccent.1\012  rcaron.1\012  rdblgrave.1\012  rinvertedbreve.1\012  rdotaccent.1\012  rdotbelow.1\012  rdotbelowmacron.1\012  rlinebelow.1\012];\012@f = [  # horizontal bar extending left\012  f fdotaccent\012  t tpalatalhook trthook tcurl tccurl tturn tbar tcommaaccent tcaron uni021B\012    tdotaccent tdotbelow tlinebelow tcircumflexbelow tdieresis\012  z zbar zhook uni0240 zrthook zacute zdotaccent zcaron zcircumflex zdotbelow\012    zlinebelow zcurl\012  pi tau\012  uni04FB kabashkircyrillic tecyrillic hardsigncyrillic tetsecyrillic\012];\012@n = [  # x-height vertical bar on left side\012  i idotless itildebelow uni1E2D.ccmp igrave iacute uni012F.ccmp iogonek\012    idotbelow uni1ECB.ccmp jdotless icyrillic ij\012  j jcrosstail.ccmp jcrosstail yotgreek jecyrillic\012  m mhook mturn mturndescend macute mdotaccent mdotbelow\012  n ntilde nrthook eng ncurl nlfthook nlegrightlong nacute ncommaaccent\012    ncaron uni01F9 ndotaccent ndotbelow nlinebelow ncircumflexbelow nj\012  r rrthook uni024D rdescend racute rcommaaccent rcaron rdblgrave\012    rinvertedbreve rdotaccent rdotbelow rdotbelowmacron rlinebelow r.1\012    rrthook.1 uni024D.1 rdescend.1 racute.1 rcommaaccent.1 rcaron.1 rdblgrave.1\012    rinvertedbreve.1 rdotaccent.1 rdotbelow.1 rdotbelowmacron.1 rlinebelow.1\012  u udieresis utilde uhorn micro ubar ugrave uacute ucircumflex umacron ubreve\012    uring uhungarumlaut uogonek ucaron udieresismacron udieresisacute\012    udieresiscaron udieresisgrave udblgrave uinvertedbreve udieresisbelow\012    utildebelow ucircumflexbelow utildeacute umacrondieresis udotbelow\012    uhookabove uhornacute uhorngrave uhornhookabove uhorntilde uhorndotbelow\012  eta etatonos uni1F20 uni1F21 uni1F22 uni1F23 uni1F24 uni1F25 uni1F26\012    uni1F27 uni1F74 uni1F90 uni1F91 uni1F92 uni1F93 uni1F94 uni1F95 uni1F96\012    uni1F97 uni1FC2 uni1FC3 uni1FC4 uni1FC6 uni1FC7\012  iota iotadieresistonos iotatonos iotadieresis uni1F30 uni1F31 uni1F32\012    uni1F33 uni1F34 uni1F35 uni1F36 uni1F37 uni1F76 uni1FD0 uni1FD1 uni1FD2\012    uni1FD6 uni1FD7\012  upsilon upsilondieresistonos upsilondieresis upsilontonos uni1F50 uni1F51\012    uni1F52 uni1F53 uni1F54 uni1F55 uni1F56 uni1F57 uni1F7A uni1FE0 uni1FE1\012    uni1FE2 uni1FE6 uni1FE7\012  psi\012  vecyrillic gecyrillic gheupturncyrillic iicyrillic uni048B kacyrillic\012    kahookcyrillic kadescendercyrillic kaverticalstrokecyrillic emcyrillic\012    uni04CE encyrillic endescendercyrillic enghecyrillic enhookcyrillic\012    uni04CA pecyrillic tsecyrillic dzhecyrillic shacyrillic shchacyrillic\012    softsigncyrillic yericyrillic njecyrillic iucyrillic ghemiddlehookcyrillic\012    pemiddlehookcyrillic\012];\012@v = [  # diagonal bar extending top left\012  v vtilde vdotbelow\012  w wdieresis wturn wcircumflex wgrave wacute wdotaccent wdotbelow wring\012  x xdotaccent xdieresis khacyrillic\012  y ydieresis yhook uni024F yacute ycircumflex uni0233 ydotaccent yring\012    ygrave ydotbelow yhookabove ytilde ucyrillic ushortcyrillic umacroncyrillic\012    udieresiscyrillic uhungarumlautcyrillic\012  gamma1\012  zhecyrillic zhedescendercyrillic uni04FD hadescendercyrillic\012    cheabkhasiancyrillic izhitsacyrillic\012];\012\012@one = [ one one.ss01 one.tf one.tf.ss01 ];\012@top_quote = [ quoteleft quoteright quotesingle quotedbl quotedblleft quotedblright ];\012\012@sups = [ a.sups b.sups c.sups d.sups e.sups f.sups g.sups h.sups i.sups j.sups k.sups l.sups m.sups n.sups o.sups p.sups q.sups r.sups s.sups t.sups u.sups v.sups w.sups x.sups y.sups z.sups zero.sups one.sups two.sups three.sups four.sups five.sups six.sups seven.sups eight.sups nine.sups parenleft.sups parenright.sups plus.sups minus.sups equal.sups zero.numr one.numr two.numr three.numr four.numr five.numr six.numr seven.numr eight.numr nine.numr plus.numr minus.numr equal.numr parenleft.numr parenright.numr zero.frac one.frac two.frac three.frac four.frac five.frac six.frac seven.frac eight.frac nine.frac ];\012\012@frac = [ onehalf onethird onequarter threequarters fivesixths onefraction seveneighths oneeighth fiveeighths threeeighths uni214D cadauna careof accountof addresssubject ];\012\012# Replace \"r\" with \"r.1\" when it preceeds glyphs with things\012# extending leftwards to the tail of the r.\012# This breaks the glyphs up better, increasing legibility.\012sub @r_A' [ @f @n @v @one @top_quote @sups @frac kturn ] by @r_B;\012";
-name = liga;
-},
-{
 code = "sub exclam question by interrobang;\012sub question exclam by interrobang;\012sub exclamdown questiondown by invertedinterrobang;\012sub questiondown exclamdown by invertedinterrobang;\012";
 name = dlig;
 },
@@ -192776,7 +192775,7 @@ unicode = 007D;
 },
 {
 glyphname = at;
-lastChange = "2019-01-20 01:56:59 +0000";
+lastChange = "2019-02-08 17:48:03 +0000";
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -192784,29 +192783,6 @@ paths = (
 {
 closed = 1;
 nodes = (
-"1528 1180 OFFCURVE",
-"1656 1084 OFFCURVE",
-"1656 748 CURVE SMOOTH",
-"1656 416 OFFCURVE",
-"1548 256 OFFCURVE",
-"1280 256 CURVE SMOOTH",
-"1020 256 OFFCURVE",
-"928 492 OFFCURVE",
-"928 748 CURVE SMOOTH",
-"928 980 OFFCURVE",
-"1060 1180 OFFCURVE",
-"1288 1180 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"596 1972 OFFCURVE",
-"136 1504 OFFCURVE",
-"136 724 CURVE SMOOTH",
-"136 -84 OFFCURVE",
-"580 -540 OFFCURVE",
-"1396 -540 CURVE SMOOTH",
 "1600 -540 OFFCURVE",
 "1860 -480 OFFCURVE",
 "1984 -428 CURVE",
@@ -192854,7 +192830,30 @@ nodes = (
 "2500 884 CURVE SMOOTH",
 "2500 1432 OFFCURVE",
 "2116 1972 OFFCURVE",
-"1368 1972 CURVE SMOOTH"
+"1368 1972 CURVE SMOOTH",
+"596 1972 OFFCURVE",
+"136 1504 OFFCURVE",
+"136 724 CURVE SMOOTH",
+"136 -84 OFFCURVE",
+"580 -540 OFFCURVE",
+"1396 -540 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"1020 256 OFFCURVE",
+"928 492 OFFCURVE",
+"928 748 CURVE SMOOTH",
+"928 980 OFFCURVE",
+"1060 1180 OFFCURVE",
+"1288 1180 CURVE SMOOTH",
+"1528 1180 OFFCURVE",
+"1656 1084 OFFCURVE",
+"1656 748 CURVE SMOOTH",
+"1656 416 OFFCURVE",
+"1548 256 OFFCURVE",
+"1280 256 CURVE SMOOTH"
 );
 }
 );
@@ -192866,29 +192865,6 @@ paths = (
 {
 closed = 1;
 nodes = (
-"1842 1052 OFFCURVE",
-"1882 892 OFFCURVE",
-"1884 716 CURVE SMOOTH",
-"1890 484 OFFCURVE",
-"1818 352 OFFCURVE",
-"1588 352 CURVE SMOOTH",
-"1326 352 OFFCURVE",
-"1242 528 OFFCURVE",
-"1240 712 CURVE SMOOTH",
-"1242 936 OFFCURVE",
-"1362 1052 OFFCURVE",
-"1580 1052 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"710 2084 OFFCURVE",
-"194 1508 OFFCURVE",
-"192 688 CURVE SMOOTH",
-"194 -136 OFFCURVE",
-"714 -624 OFFCURVE",
-"1588 -624 CURVE SMOOTH",
 "1926 -624 OFFCURVE",
 "2218 -552 OFFCURVE",
 "2344 -468 CURVE",
@@ -192936,7 +192912,30 @@ nodes = (
 "2980 804 CURVE SMOOTH",
 "2982 1624 OFFCURVE",
 "2454 2084 OFFCURVE",
-"1628 2084 CURVE SMOOTH"
+"1628 2084 CURVE SMOOTH",
+"710 2084 OFFCURVE",
+"194 1508 OFFCURVE",
+"192 688 CURVE SMOOTH",
+"194 -136 OFFCURVE",
+"714 -624 OFFCURVE",
+"1588 -624 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"1326 352 OFFCURVE",
+"1242 528 OFFCURVE",
+"1240 712 CURVE SMOOTH",
+"1242 936 OFFCURVE",
+"1362 1052 OFFCURVE",
+"1580 1052 CURVE SMOOTH",
+"1842 1052 OFFCURVE",
+"1882 892 OFFCURVE",
+"1884 716 CURVE SMOOTH",
+"1890 484 OFFCURVE",
+"1818 352 OFFCURVE",
+"1588 352 CURVE SMOOTH"
 );
 }
 );
@@ -192948,29 +192947,6 @@ paths = (
 {
 closed = 1;
 nodes = (
-"1596 1180 OFFCURVE",
-"1708 1084 OFFCURVE",
-"1652 748 CURVE SMOOTH",
-"1596 416 OFFCURVE",
-"1464 256 OFFCURVE",
-"1196 256 CURVE SMOOTH",
-"936 256 OFFCURVE",
-"884 492 OFFCURVE",
-"924 748 CURVE SMOOTH",
-"964 980 OFFCURVE",
-"1128 1180 OFFCURVE",
-"1356 1180 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"796 1972 OFFCURVE",
-"256 1504 OFFCURVE",
-"128 724 CURVE SMOOTH",
-"-4 -84 OFFCURVE",
-"364 -540 OFFCURVE",
-"1180 -540 CURVE SMOOTH",
 "1384 -540 OFFCURVE",
 "1652 -480 OFFCURVE",
 "1788 -428 CURVE",
@@ -193018,7 +192994,30 @@ nodes = (
 "2520 884 CURVE SMOOTH",
 "2608 1432 OFFCURVE",
 "2316 1972 OFFCURVE",
-"1568 1972 CURVE SMOOTH"
+"1568 1972 CURVE SMOOTH",
+"796 1972 OFFCURVE",
+"256 1504 OFFCURVE",
+"128 724 CURVE SMOOTH",
+"-4 -84 OFFCURVE",
+"364 -540 OFFCURVE",
+"1180 -540 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"936 256 OFFCURVE",
+"884 492 OFFCURVE",
+"924 748 CURVE SMOOTH",
+"964 980 OFFCURVE",
+"1128 1180 OFFCURVE",
+"1356 1180 CURVE SMOOTH",
+"1596 1180 OFFCURVE",
+"1708 1084 OFFCURVE",
+"1652 748 CURVE SMOOTH",
+"1596 416 OFFCURVE",
+"1464 256 OFFCURVE",
+"1196 256 CURVE SMOOTH"
 );
 }
 );
@@ -193030,29 +193029,6 @@ paths = (
 {
 closed = 1;
 nodes = (
-"1890 1052 OFFCURVE",
-"1902 892 OFFCURVE",
-"1876 716 CURVE SMOOTH",
-"1842 484 OFFCURVE",
-"1750 352 OFFCURVE",
-"1520 352 CURVE SMOOTH",
-"1258 352 OFFCURVE",
-"1202 528 OFFCURVE",
-"1232 712 CURVE SMOOTH",
-"1270 936 OFFCURVE",
-"1410 1052 OFFCURVE",
-"1628 1052 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"926 2084 OFFCURVE",
-"318 1508 OFFCURVE",
-"180 688 CURVE SMOOTH",
-"46 -136 OFFCURVE",
-"482 -624 OFFCURVE",
-"1356 -624 CURVE SMOOTH",
 "1694 -624 OFFCURVE",
 "1998 -552 OFFCURVE",
 "2140 -468 CURVE",
@@ -193100,7 +193076,30 @@ nodes = (
 "2984 804 CURVE SMOOTH",
 "3122 1624 OFFCURVE",
 "2670 2084 OFFCURVE",
-"1844 2084 CURVE SMOOTH"
+"1844 2084 CURVE SMOOTH",
+"926 2084 OFFCURVE",
+"318 1508 OFFCURVE",
+"180 688 CURVE SMOOTH",
+"46 -136 OFFCURVE",
+"482 -624 OFFCURVE",
+"1356 -624 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"1258 352 OFFCURVE",
+"1202 528 OFFCURVE",
+"1232 712 CURVE SMOOTH",
+"1270 936 OFFCURVE",
+"1410 1052 OFFCURVE",
+"1628 1052 CURVE SMOOTH",
+"1890 1052 OFFCURVE",
+"1902 892 OFFCURVE",
+"1876 716 CURVE SMOOTH",
+"1842 484 OFFCURVE",
+"1750 352 OFFCURVE",
+"1520 352 CURVE SMOOTH"
 );
 }
 );
@@ -193226,29 +193225,6 @@ paths = (
 {
 closed = 1;
 nodes = (
-"1568 1312 OFFCURVE",
-"1792 1044 OFFCURVE",
-"1792 712 CURVE SMOOTH",
-"1792 378 OFFCURVE",
-"1569 112 OFFCURVE",
-"1292 112 CURVE SMOOTH",
-"1016 112 OFFCURVE",
-"788 380 OFFCURVE",
-"788 712 CURVE SMOOTH",
-"788 1044 OFFCURVE",
-"1016 1312 OFFCURVE",
-"1292 1312 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"668 1968 OFFCURVE",
-"140 1408 OFFCURVE",
-"140 712 CURVE SMOOTH",
-"140 20 OFFCURVE",
-"668 -544 OFFCURVE",
-"1320 -544 CURVE SMOOTH",
 "1552 -544 OFFCURVE",
 "1776 -472 OFFCURVE",
 "1968 -336 CURVE",
@@ -193296,7 +193272,30 @@ nodes = (
 "2496 712 CURVE SMOOTH",
 "2496 1408 OFFCURVE",
 "1968 1968 OFFCURVE",
-"1320 1968 CURVE SMOOTH"
+"1320 1968 CURVE SMOOTH",
+"668 1968 OFFCURVE",
+"140 1408 OFFCURVE",
+"140 712 CURVE SMOOTH",
+"140 20 OFFCURVE",
+"668 -544 OFFCURVE",
+"1320 -544 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"1016 112 OFFCURVE",
+"788 380 OFFCURVE",
+"788 712 CURVE SMOOTH",
+"788 1044 OFFCURVE",
+"1016 1312 OFFCURVE",
+"1292 1312 CURVE SMOOTH",
+"1568 1312 OFFCURVE",
+"1792 1044 OFFCURVE",
+"1792 712 CURVE SMOOTH",
+"1792 378 OFFCURVE",
+"1569 112 OFFCURVE",
+"1292 112 CURVE SMOOTH"
 );
 }
 );
@@ -193308,29 +193307,6 @@ paths = (
 {
 closed = 1;
 nodes = (
-"1668 1312 OFFCURVE",
-"1836 1044 OFFCURVE",
-"1784 712 CURVE SMOOTH",
-"1728 380 OFFCURVE",
-"1448 112 OFFCURVE",
-"1172 112 CURVE SMOOTH",
-"896 112 OFFCURVE",
-"724 380 OFFCURVE",
-"780 712 CURVE SMOOTH",
-"832 1044 OFFCURVE",
-"1116 1312 OFFCURVE",
-"1392 1312 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"868 1968 OFFCURVE",
-"244 1408 OFFCURVE",
-"132 712 CURVE SMOOTH",
-"16 20 OFFCURVE",
-"452 -544 OFFCURVE",
-"1104 -544 CURVE SMOOTH",
 "1336 -544 OFFCURVE",
 "1572 -472 OFFCURVE",
 "1784 -336 CURVE",
@@ -193378,7 +193354,30 @@ nodes = (
 "2488 712 CURVE SMOOTH",
 "2600 1408 OFFCURVE",
 "2168 1968 OFFCURVE",
-"1520 1968 CURVE SMOOTH"
+"1520 1968 CURVE SMOOTH",
+"868 1968 OFFCURVE",
+"244 1408 OFFCURVE",
+"132 712 CURVE SMOOTH",
+"16 20 OFFCURVE",
+"452 -544 OFFCURVE",
+"1104 -544 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"896 112 OFFCURVE",
+"724 380 OFFCURVE",
+"780 712 CURVE SMOOTH",
+"832 1044 OFFCURVE",
+"1116 1312 OFFCURVE",
+"1392 1312 CURVE SMOOTH",
+"1668 1312 OFFCURVE",
+"1836 1044 OFFCURVE",
+"1784 712 CURVE SMOOTH",
+"1728 380 OFFCURVE",
+"1448 112 OFFCURVE",
+"1172 112 CURVE SMOOTH"
 );
 }
 );