Pass outer coordinates to inner coordinates

harfbuzz · Mar 27, 2023 · cbdaed9 · cbdaed9
1 parent ec67ff4
commit cbdaed9
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 6 deletions.
diff --git a/base-fonts/Recursive-subset.ttf b/base-fonts/Recursive-subset.ttf
diff --git a/inception/Inception-VF.ttf b/inception/Inception-VF.ttf
diff --git a/inception/Inception.glyphs b/inception/Inception.glyphs
@@ -13,6 +13,18 @@ tag = ROND;
 {
 name = "Optical Size";
 tag = opsz;
+},
+{
+name = Weight;
+tag = wght;
+},
+{
+name = Slant;
+tag = slnt;
+},
+{
+name = Cursive;
+tag = CURS;
 }
 );
 date = "2023-03-26 14:34:12 +0000";
@@ -21,7 +33,10 @@ fontMaster = (
 {
 axesValues = (
 100,
-200
+200,
+0,
+0,
+0
 );
 id = m01;
 metricValues = (
@@ -52,7 +67,10 @@ name = "Small Round";
 {
 axesValues = (
 100,
-9
+9,
+0,
+0,
+0
 );
 id = "91F0254D-AE70-4F0E-839A-589122BCBEE9";
 metricValues = (
@@ -83,7 +101,10 @@ name = "Large Round";
 {
 axesValues = (
 0,
-200
+200,
+0,
+0,
+0
 );
 id = "E2AC362B-EF5F-4483-802D-EA6D735A27A3";
 metricValues = (
@@ -114,7 +135,10 @@ name = "Small Square";
 {
 axesValues = (
 0,
-9
+9,
+0,
+0,
+0
 );
 id = "53B69B1A-7EC8-4DB3-B9E3-541D2D7A0A5E";
 metricValues = (

diff --git a/inception/Makefile b/inception/Makefile
@@ -5,11 +5,12 @@ TARGET_SOURCE=Inception.glyphs
 WASM=inception_bg.wasm
 
 # This one is a little different.
-$(TARGET_FONT): pkg/$(WASM) $(SLIM_BASE_FONT) $(TARGET_SOURCE) colr.ttx
+$(TARGET_FONT): pkg/$(WASM) $(SLIM_BASE_FONT) $(TARGET_SOURCE) colr.ttx fvar.ttx
 	fontmake -o variable -g $(TARGET_SOURCE)
 	../bin/otfsurgeon -i variable_ttf/Inception-VF.ttf add -o $(TARGET_FONT) Font < $(SLIM_BASE_FONT)
 	../bin/otfsurgeon -i $(TARGET_FONT) add -o $(TARGET_FONT) Wasm < pkg/$(WASM)
 	ttx -o $(TARGET_FONT) -m $(TARGET_FONT) colr.ttx
+	ttx -o $(TARGET_FONT) -m $(TARGET_FONT) fvar.ttx
 
 $(SLIM_BASE_FONT): $(BASE_FONT)
 	../bin/otfsurgeon -i $(BASE_FONT) strip -o $(SLIM_BASE_FONT) 'name' 'OS/2' 'MVAR' 'prep' 'HVAR' 'STAT' 'gasp'

diff --git a/inception/fvar.ttx b/inception/fvar.ttx
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="4.38">
+
+  <fvar>
+
+    <!-- Pixel Shape -->
+    <Axis>
+      <AxisTag>ROND</AxisTag>
+      <Flags>0x0</Flags>
+      <MinValue>0.0</MinValue>
+      <DefaultValue>100.0</DefaultValue>
+      <MaxValue>100.0</MaxValue>
+      <AxisNameID>256</AxisNameID>
+    </Axis>
+
+    <!-- Optical Size -->
+    <Axis>
+      <AxisTag>opsz</AxisTag>
+      <Flags>0x0</Flags>
+      <MinValue>9.0</MinValue>
+      <DefaultValue>200.0</DefaultValue>
+      <MaxValue>200.0</MaxValue>
+      <AxisNameID>257</AxisNameID>
+    </Axis>
+
+    <!-- Weight -->
+    <Axis>
+      <AxisTag>wght</AxisTag>
+      <Flags>0x0</Flags>
+      <MinValue>400.0</MinValue>
+      <DefaultValue>400.0</DefaultValue>
+      <MaxValue>800.0</MaxValue>
+      <AxisTag>wght</AxisTag>
+      <AxisNameID>258</AxisNameID>
+    </Axis>
+
+    <!-- Slant -->
+    <Axis>
+      <AxisTag>slnt</AxisTag>
+      <Flags>0x0</Flags>
+      <MinValue>-15.0</MinValue>
+      <DefaultValue>0.0</DefaultValue>
+      <MaxValue>0.0</MaxValue>
+      <AxisNameID>259</AxisNameID>
+    </Axis>
+
+    <!-- Cursive -->
+    <Axis>
+      <AxisTag>CRSV</AxisTag>
+      <Flags>0x0</Flags>
+      <MinValue>0.0</MinValue>
+      <DefaultValue>0.5</DefaultValue>
+      <MaxValue>1.0</MaxValue>
+      <AxisNameID>260</AxisNameID>
+    </Axis>
+
+  </fvar>
+
+</ttFont>
diff --git a/inception/src/lib.rs b/inception/src/lib.rs
@@ -86,7 +86,15 @@ pub fn shape(
     // let (x_scale, _y_scale) = font.get_scale();
     let pixel_size = -font.get_glyph_extents(2).height as f32;
     // debug(&format!("Test pixel size: {}", pixel_size));
-    // debug(&format!("Test X scale: {}", x_scale));
+    let coords = font.get_var_coords();
+    // debug(&format!("Test Outer Coords: {:?}", coords));
+    if coords.len() > 1 {
+        inner_font.set_var_coords(&coords[2..]);
+        // debug(&format!(
+        //     "Test Inner Coords: {:?}",
+        //     inner_font.get_var_coords()
+        // ));
+    }
     let mut new_glyphs: Vec<Glyph> = vec![];
 
     // Ordinary shaping