From 9c764b6dc6e020aedc3373561a09f41f479847e3 Mon Sep 17 00:00:00 2001
From: James Godfrey-Kittle <jamesgk@google.com>
Date: Fri, 4 Sep 2015 17:07:30 -0700
Subject: Fix up *num features.

A few things happening here:
 - References to *.lnum glyphs changed to *.pnum (reflecting the
   renames in the last commit).
 - Feature definitions expanded to handle feature combinations,
   not-working definitions removed from the resource directory.
 - Glyph classes added to make feature definitions clearer.
 - VFBs updated via vfb2ufo, based on updates to UFOs.
---
 res/diacritics.txt  | 26 ++++++++++++++++----------
 res/ot_classes.txt  |  2 --
 res/ot_features.txt |  6 +-----
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'res')

diff --git a/res/diacritics.txt b/res/diacritics.txt
index c6fea0c..ec6a132 100644
--- a/res/diacritics.txt
+++ b/res/diacritics.txt
@@ -544,15 +544,21 @@ x+crossbar:cross=uni04FF
 epsilon=uni0511
 F+crossbar:cross=franc
 emdash=uni2015
-#Lining numbers
-two=two.lnum
-three=three.lnum
-four=four.lnum
-five=five.lnum
-six=six.lnum/20,0
-eight=eight.lnum/20,20
-nine=nine.lnum/0,20
-zero=zero.lnum/20,20
+#
+# proportional numbers
+two=two.pnum
+three=three.pnum
+four=four.pnum
+five=five.pnum
+six=six.pnum/20,0
+eight=eight.pnum/20,20
+nine=nine.pnum/0,20
+zero=zero.pnum/20,20
+#
+# old-style numbers
+six=six.onum
+eight=eight.onum
+#
 # AddGlyphs
 uni1FBE=uni037A
 #I=Iota1
@@ -1134,4 +1140,4 @@ U.unic+ring:top=Uring.unic
 U.unic+hungarumlaut:top=Uhungarumlaut.unic
 U.unic+ogonek:ogonek=Uogonek.unic
 dotlessi+tildesubnosp:bottom=uni1E2D.ccmp
-dotlessi+dotbelow:bottom=uni1ECB.ccmp
\ No newline at end of file
+dotlessi+dotbelow:bottom=uni1ECB.ccmp
diff --git a/res/ot_classes.txt b/res/ot_classes.txt
index fe26046..c46f019 100644
--- a/res/ot_classes.txt
+++ b/res/ot_classes.txt
@@ -22,8 +22,6 @@ languagesystem grek dflt;
 @UC_SET3 = [ Alpha Alphatonos Beta Chi Delta Epsilon Epsilontonos Eta Etatonos Gamma Iota Iotadieresis Iotatonos Kappa Lambda Mu Omega Omegatonos Omicron Omicrontonos Phi Pi Psi Rho Sigma Tau Theta Upsilon Upsilondieresis Upsilontonos Xi Zeta Nu uni037F ];
 @LC_SET3 = [ alpha alphatonos beta chi delta epsilon epsilontonos eta etatonos gamma iota iotadieresis iotatonos kappa lambda uni03BC omega omegatonos omicron omicrontonos phi pi psi rho sigma tau theta upsilon upsilondieresis upsilontonos xi zeta nu uni03F3 ];
 @SC_SET3 = [ Alpha.smcp Alphatonos.smcp Beta.smcp Chi.smcp Delta.smcp Epsilon.smcp Epsilontonos.smcp Eta.smcp Etatonos.smcp Gamma.smcp Iota.smcp Iotadieresis.smcp Iotatonos.smcp Kappa.smcp Lambda.smcp Mu.smcp Omega.smcp Omegatonos.smcp Omicron.smcp Omicrontonos.smcp Phi.smcp Pi.smcp Psi.smcp Rho.smcp Sigma.smcp Tau.smcp Theta.smcp Upsilon.smcp Upsilondieresis.smcp Upsilontonos.smcp Xi.smcp Zeta.smcp Nu.smcp uni037F.smcp ];
-#@TNUM = [zero one two three four five six seven eight nine];
-#@LNUM = [zero.lnum one.lnum two.lnum three.lnum four.lnum five.lnum six.lnum seven.lnum eight.lnum nine.lnum];
 @frac1 = [ zero one two three four five six seven eight nine ];
 @frac2 = [ zero.frac onesuperior twosuperior threesuperior four.frac five.frac six.frac seven.frac eight.frac nine.frac ];
 @frac3 = [ fraction zero.sup one.sup two.sup three.sup four.sup five.sup six.sup seven.sup eight.sup nine.sup ];
diff --git a/res/ot_features.txt b/res/ot_features.txt
index ac707e1..d189d46 100644
--- a/res/ot_features.txt
+++ b/res/ot_features.txt
@@ -10,10 +10,6 @@ feature liga {
   sub f f i by ffi;
 } liga;
 
-feature lnum {
-  sub @TNUM by @LNUM;
-}
-
 feature ss01 {
   sub alpha by alpha.alt;
 }
@@ -24,4 +20,4 @@ feature ss02 {
 
 feature ss03 {
   sub R by R.alt;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3