Reshuffled master UFOs for building variable fonts from them

.gitignore

@@ -6,3 +6,4 @@ ItalicMasters/colors_0
 ItalicMasters/colors_1
 ItalicMasters/colors_2
 *.otf
+current.fpr

FontMenuNameDB

@@ -1 +1 @@
-# [PostScriptName]
# 	f=FamilyName
# 	s=StyleName
# 	l=Windows_Compatible_MenuName
# 	m=1,Macintosh_Compatible_MenuName


[SourceCodePro-ExtraLight]
	f=Source Code Pro
	s=ExtraLight
	l=Source Code Pro ExtraLight
	m=1,Source Code Pro ExtraLight

[SourceCodePro-ExtraLightIt]
	f=Source Code Pro
	s=ExtraLight Italic
	l=Source Code Pro ExtraLight
	m=1,Source Code Pro ExtraLight Italic

[SourceCodePro-Light]
	f=Source Code Pro
	s=Light
	l=Source Code Pro Light
	m=1,Source Code Pro Light

[SourceCodePro-LightIt]
	f=Source Code Pro
	s=Light Italic
	l=Source Code Pro Light
	m=1,Source Code Pro Light Italic

[SourceCodePro-Regular]
	f=Source Code Pro
	s=Regular
	l=Source Code Pro
	m=1,Source Code Pro

[SourceCodePro-It]
	f=Source Code Pro
	s=Italic
	l=Source Code Pro
	m=1,Source Code Pro Italic

[SourceCodePro-Medium]
	f=Source Code Pro
	s=Medium
	l=Source Code Pro Medium
	m=1,Source Code Pro Medium

[SourceCodePro-MediumIt]
	f=Source Code Pro
	s=Medium Italic
	l=Source Code Pro Medium
	m=1,Source Code Pro Medium Italic

[SourceCodePro-Semibold]
	f=Source Code Pro
	s=Semibold
	l=Source Code Pro Semibold
	m=1,Source Code Pro Semibold

[SourceCodePro-SemiboldIt]
	f=Source Code Pro
	s=Semibold Italic
	l=Source Code Pro Semibold
	m=1,Source Code Pro Semibold Italic

[SourceCodePro-Bold]
	f=Source Code Pro
	s=Bold
	l=Source Code Pro
	m=1,Source Code Pro Bold
	
[SourceCodePro-BoldIt]
	f=Source Code Pro
	s=Bold Italic
	l=Source Code Pro
	m=1,Source Code Pro Bold Italic
	
[SourceCodePro-Black]
	f=Source Code Pro
	s=Black
	l=Source Code Pro Black
	m=1,Source Code Pro Black
	
[SourceCodePro-BlackIt]
	f=Source Code Pro
	s=Black Italic
	l=Source Code Pro Black
	m=1,Source Code Pro Black Italic
+# [PostScriptName]
# 	f=FamilyName
# 	s=StyleName
# 	l=Windows_Compatible_MenuName
# 	m=1,Macintosh_Compatible_MenuName


# ====================================================================
# Variable fonts

[SourceCodePro-Master0]
	f=Source Code Pro
	s=Master 0

[SourceCodePro-Master1]
	f=Source Code Pro
	s=Master 1

[SourceCodePro-Master2]
	f=Source Code Pro
	s=Master 2


# ====================================================================
# Instance fonts

[SourceCodePro-ExtraLight]
	f=Source Code Pro
	s=ExtraLight
	l=Source Code Pro ExtraLight
	m=1,Source Code Pro ExtraLight

[SourceCodePro-ExtraLightIt]
	f=Source Code Pro
	s=ExtraLight Italic
	l=Source Code Pro ExtraLight
	m=1,Source Code Pro ExtraLight Italic

[SourceCodePro-Light]
	f=Source Code Pro
	s=Light
	l=Source Code Pro Light
	m=1,Source Code Pro Light

[SourceCodePro-LightIt]
	f=Source Code Pro
	s=Light Italic
	l=Source Code Pro Light
	m=1,Source Code Pro Light Italic

[SourceCodePro-Regular]
	f=Source Code Pro
	s=Regular
	l=Source Code Pro
	m=1,Source Code Pro

[SourceCodePro-It]
	f=Source Code Pro
	s=Italic
	l=Source Code Pro
	m=1,Source Code Pro Italic

[SourceCodePro-Medium]
	f=Source Code Pro
	s=Medium
	l=Source Code Pro Medium
	m=1,Source Code Pro Medium

[SourceCodePro-MediumIt]
	f=Source Code Pro
	s=Medium Italic
	l=Source Code Pro Medium
	m=1,Source Code Pro Medium Italic

[SourceCodePro-Semibold]
	f=Source Code Pro
	s=Semibold
	l=Source Code Pro Semibold
	m=1,Source Code Pro Semibold

[SourceCodePro-SemiboldIt]
	f=Source Code Pro
	s=Semibold Italic
	l=Source Code Pro Semibold
	m=1,Source Code Pro Semibold Italic

[SourceCodePro-Bold]
	f=Source Code Pro
	s=Bold
	l=Source Code Pro
	m=1,Source Code Pro Bold

[SourceCodePro-BoldIt]
	f=Source Code Pro
	s=Bold Italic
	l=Source Code Pro
	m=1,Source Code Pro Bold Italic

[SourceCodePro-Black]
	f=Source Code Pro
	s=Black
	l=Source Code Pro Black
	m=1,Source Code Pro Black

[SourceCodePro-BlackIt]
	f=Source Code Pro
	s=Black Italic
	l=Source Code Pro Black
	m=1,Source Code Pro Black Italic

RomanMasters/SourceCodePro.designspace

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <designspace format="3">
     <sources>
-		<source filename="SourceCodePro_0.ufo" name="master_0">
+		<source filename="master_0/font.ufo" name="master_0">
             <lib copy="1" />
             <groups copy="1" />
             <info copy="1" />
             <location>
-                <dimension name="weight" xvalue="0.000000" />
+                <dimension name="weight" xvalue="0" />
             </location>
         </source>
-		<source filename="SourceCodePro_1.ufo" name="master_1">
+		<source filename="master_1/font.ufo" name="master_1">
             <glyph mute="1" name="D" />
             <glyph mute="1" name="H" />
             <glyph mute="1" name="O" />
@@ -23,61 +23,61 @@
             <glyph mute="1" name="t" />
             <glyph mute="1" name="ustraight" />
             <location>
-                <dimension name="weight" xvalue="368.000000" />
+                <dimension name="weight" xvalue="368" />
             </location>
         </source>
-		<source filename="SourceCodePro_2.ufo" name="master_2">
+		<source filename="master_2/font.ufo" name="master_2">
             <location>
-                <dimension name="weight" xvalue="1000.000000" />
+                <dimension name="weight" xvalue="1000" />
             </location>
         </source>
     </sources>
     <instances>
 		<instance familyname="Source Code Pro" filename="../Roman/ExtraLight/font.ufo" postscriptfontname="SourceCodePro-ExtraLight" stylename="ExtraLight">
             <location>
-                <dimension name="weight" xvalue="0.000000" />
+                <dimension name="weight" xvalue="0" />
             </location>
             <kerning />
             <info />
         </instance>
 		<instance familyname="Source Code Pro" filename="../Roman/Light/font.ufo" postscriptfontname="SourceCodePro-Light" stylename="Light">
             <location>
-                <dimension name="weight" xvalue="100.000000" />
+                <dimension name="weight" xvalue="100" />
             </location>
             <kerning />
             <info />
         </instance>
 		<instance familyname="Source Code Pro" filename="../Roman/Regular/font.ufo" postscriptfontname="SourceCodePro-Regular" stylename="Regular">
             <location>
-                <dimension name="weight" xvalue="368.000000" />
+                <dimension name="weight" xvalue="368" />
             </location>
             <kerning />
             <info />
         </instance>
 		<instance familyname="Source Code Pro" filename="../Roman/Medium/font.ufo" postscriptfontname="SourceCodePro-Medium" stylename="Medium">
             <location>
-                <dimension name="weight" xvalue="486.000000" />
+                <dimension name="weight" xvalue="486" />
             </location>
             <kerning />
             <info />
         </instance>
 		<instance familyname="Source Code Pro" filename="../Roman/Semibold/font.ufo" postscriptfontname="SourceCodePro-Semibold" stylename="Semibold">
             <location>
-                <dimension name="weight" xvalue="600.000000" />
+                <dimension name="weight" xvalue="600" />
             </location>
             <kerning />
             <info />
         </instance>
 		<instance familyname="Source Code Pro" filename="../Roman/Bold/font.ufo" postscriptfontname="SourceCodePro-Bold" stylename="Bold">
             <location>
-                <dimension name="weight" xvalue="824.000000" />
+                <dimension name="weight" xvalue="824" />
             </location>
             <kerning />
             <info />
         </instance>
 		<instance familyname="Source Code Pro" filename="../Roman/Black/font.ufo" postscriptfontname="SourceCodePro-Black" stylename="Black">
             <location>
-                <dimension name="weight" xvalue="1000.000000" />
+                <dimension name="weight" xvalue="1000" />
             </location>
             <kerning />
             <info />

RomanMasters/SourceCodePro.sp3

@@ -15,28 +15,28 @@
     <!-- don't generate these glyphs -->
     <ignore glyphs=""/>
     <!-- axis definitions -->
-    <axis initialvalue="0.000000" maximum="1000.000000" minimum="0.000000" name="weight" shortname="wt">
+    <axis initialvalue="0" maximum="1000" minimum="0" name="weight" shortname="wt">
         <color a="1.000" b="0.800" g="1.000" r="0.400"/>
     </axis>
     <!-- master definitions -->
-    <master familyname="Source Code Pro" filename="SourceCodePro_0.ufo" sortorder="0" stylename="Master0">
+    <master familyname="Source Code Pro" filename="master_0/font.ufo" sortorder="0" stylename="Master0">
         <location>
-            <dimension name="weight" xvalue="0.000000"/>
+            <dimension name="weight" xvalue="0"/>
         </location>
         <color a="1.000" b="0.000" g="1.000" r="0.000"/>
         <provideGroups state="1"/>
         <provideLib state="1"/>
         <provideInfo state="1"/>
     </master>
-    <master familyname="Source Code Pro" filename="SourceCodePro_2.ufo" sortorder="2" stylename="Master2">
+    <master familyname="Source Code Pro" filename="master_2/font.ufo" sortorder="2" stylename="Master2">
         <location>
-            <dimension name="weight" xvalue="1000.000000"/>
+            <dimension name="weight" xvalue="1000"/>
         </location>
         <color a="1.000" b="0.000" g="1.000" r="0.000"/>
     </master>
-    <master familyname="Source Code Pro" filename="SourceCodePro_1.ufo" sortorder="1" stylename="Master1">
+    <master familyname="Source Code Pro" filename="master_1/font.ufo" sortorder="1" stylename="Master1">
         <location>
-            <dimension name="weight" xvalue="368.000000"/>
+            <dimension name="weight" xvalue="368"/>
         </location>
         <color a="1.000" b="1.000" g="0.500" r="0.000"/>
         <maskedglyph name=".notdef"/>
@@ -1510,7 +1510,7 @@
     <!-- instance definitions -->
     <instance familyname="Source Code Pro" filename="SP3instances/SourceCodePro-ExtraLight.ufo" sortorder="3" stylename="ExtraLight">
         <location>
-            <dimension name="weight" xvalue="0.000000"/>
+            <dimension name="weight" xvalue="0"/>
         </location>
         <provideGroups state="1"/>
         <provideLib state="1"/>
@@ -1518,7 +1518,7 @@
     </instance>
     <instance familyname="Source Code Pro" filename="SP3instances/SourceCodePro-Light.ufo" sortorder="4" stylename="Light">
         <location>
-            <dimension name="weight" xvalue="100.000000"/>
+            <dimension name="weight" xvalue="100"/>
         </location>
         <provideGroups state="1"/>
         <provideLib state="1"/>
@@ -1526,7 +1526,7 @@
     </instance>
     <instance familyname="Source Code Pro" filename="SP3instances/SourceCodePro-Regular.ufo" sortorder="5" styleMapFamilyName="Source Code Pro" styleMapStyleName="regular" stylename="Regular">
         <location>
-            <dimension name="weight" xvalue="368.000000"/>
+            <dimension name="weight" xvalue="368"/>
         </location>
         <provideFeatures state="1"/>
         <provideGroups state="1"/>
@@ -1535,7 +1535,7 @@
     </instance>
     <instance familyname="Source Code Pro" filename="SP3instances/SourceCodePro-Medium.ufo" sortorder="6" stylename="Medium">
         <location>
-            <dimension name="weight" xvalue="486.000000"/>
+            <dimension name="weight" xvalue="486"/>
         </location>
         <provideFeatures state="1"/>
         <provideGroups state="1"/>
@@ -1544,7 +1544,7 @@
     </instance>
     <instance familyname="Source Code Pro" filename="SP3instances/SourceCodePro-Semibold.ufo" sortorder="7" stylename="Semibold">
         <location>
-            <dimension name="weight" xvalue="600.000000"/>
+            <dimension name="weight" xvalue="600"/>
         </location>
         <provideFeatures state="1"/>
         <provideGroups state="1"/>
@@ -1553,7 +1553,7 @@
     </instance>
     <instance familyname="Source Code Pro" filename="SP3instances/SourceCodePro-Bold.ufo" sortorder="8" styleMapFamilyName="Source Code Pro" styleMapStyleName="bold" stylename="Bold">
         <location>
-            <dimension name="weight" xvalue="824.000000"/>
+            <dimension name="weight" xvalue="824"/>
         </location>
         <provideGroups state="1"/>
         <provideLib state="1"/>
@@ -1561,7 +1561,7 @@
     </instance>
     <instance familyname="Source Code Pro" filename="SP3instances/SourceCodePro-Black.ufo" sortorder="9" stylename="Black">
         <location>
-            <dimension name="weight" xvalue="1000.000000"/>
+            <dimension name="weight" xvalue="1000"/>
         </location>
         <provideFeatures state="1"/>
         <provideGroups state="1"/>
@@ -1570,7 +1570,7 @@
     </instance>
     <instance familyname="Source Code Pro" filename="SP3instances/SourceCodePro-Ultra.ufo" sortorder="10" styleMapFamilyName="Source Code Pro" stylename="Ultra">
         <location>
-            <dimension name="weight" xvalue="1500.000000"/>
+            <dimension name="weight" xvalue="1500"/>
         </location>
         <provideFeatures state="1"/>
         <provideGroups state="1"/>
@@ -1579,7 +1579,7 @@
     </instance>
     <instance familyname="Source Code Pro" filename="SP3instances/SourceCodePro-BlackItalic.ufo" sortorder="12" stylename="Black Italic">
         <location>
-            <dimension name="weight" xvalue="920.000000"/>
+            <dimension name="weight" xvalue="920"/>
         </location>
         <provideFeatures state="1"/>
         <provideGroups state="1"/>
@@ -1588,7 +1588,7 @@
     </instance>
     <instance familyname="Source Code Pro" filename="SP3instances/SourceCodePro-LightItalic.ufo" sortorder="11" stylename="Light Italic">
         <location>
-            <dimension name="weight" xvalue="-16.000000" yvalue="-12.000000"/>
+            <dimension name="weight" xvalue="-16" yvalue="-12"/>
         </location>
         <provideFeatures state="1"/>
         <provideGroups state="1"/>

RomanMasters/master_0/features

@@ -0,0 +1,56 @@
+table head {
+   FontRevision 1.000;
+} head;
+
+include (../../family.fea);
+
+include (../../Roman/ExtraLight/markclasses.fea);
+
+feature mark {
+	include (../../widthsAdjust.fea);
+	include (../../Roman/ExtraLight/mark.fea);
+} mark;
+
+feature mkmk {
+	include (../../Roman/ExtraLight/mkmk.fea);
+} mkmk;
+
+table OS/2 {
+	Panose 2 11 3 9 3 4 3 2 2 4;
+	FSType 0;
+	# NOTE: For cross-platform consistency, OS/2.TypoAscender and |OS/2.TypoDescender| must add up to the font's UPM value
+	TypoAscender 750;	# Must be the same on all fonts for cross-platform consistency
+	TypoDescender -250;	# Must be the same on all fonts for cross-platform consistency
+	TypoLineGap 0;		# Must be zero for cross-platform consistency
+	winAscent 984;		# Must be the same on all fonts for cross-weight consistency
+	winDescent 273;		# Must be the same on all fonts for cross-weight consistency
+	XHeight 480;
+	CapHeight 660;
+	WeightClass 200;	# Extra-light (Ultra-light)
+	WidthClass 5;		# Medium (normal)
+	Vendor "ADBO";
+	UnicodeRange 0  # Basic Latin
+	             1  # Latin-1 Supplement
+	             2  # Latin Extended-A
+	             4  # IPA Extensions
+	             5  # Spacing Modifier Letters
+	             6  # Combining Diacritical Marks
+	             7  # Greek
+	             9  # Cyrillic
+	             29 # Latin Extended Additional
+	             32 # Superscripts and Subscripts
+	             33 # Currency Symbols
+	             43 # Box Drawing
+	             44 # Block Elements
+	             45 # Geometric Shapes (override to force makeotf to turn this bit on)
+	             57;# beyond the BMP (Basic Multilingual Plane)
+} OS/2;
+
+table hhea {
+	# NOTE: The OS/2.winAscent and OS/2.winDescent values are set by MakeOTF and vary depending on the font's bounding box
+	Ascender 984;		# Must match OS/2.winAscent for cross-platform consistency
+	Descender -273;		# Must match OS/2.winDescent for cross-platform consistency
+	LineGap 0;			# Must be zero for cross-platform consistency
+} hhea;
+
+include (../../tables.fea);