Smallcaps, sub- and superscript, ligature ctrls...

9 files changed, 592 insertions, 52 deletions

diff --git a/NOTICE b/NOTICE
index 8253550b..98177977 100644
--- a/NOTICE
+++ b/NOTICE
@@ -105,6 +105,190 @@ OTHER DEALINGS IN THE FONT SOFTWARE.
 ================================================================================
 
 ================================================================================
+The Apache License Version 2.0 applies to:
+
+* Roboto fonts in fonts/Roboto-*.ttf
+  (https://github.com/googlefonts/roboto)
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+================================================================================
+
+================================================================================
 The GUST Font License Version 1.0 applies to:
 
 * Latin Modern Math font in fonts/LatinModernMath.otf
diff --git a/fonts/Roboto-Regular.ttf b/fonts/Roboto-Regular.ttf
new file mode 100644
index 00000000..500b1045
--- /dev/null
+++ b/fonts/Roboto-Regular.ttf
diff --git a/src/library/mod.rs b/src/library/mod.rs
index 9a1dc2e9..c0b6f2b8 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -174,11 +174,3 @@ dynamic! {
     Value::Relative(v) => Self::Linear(v.into()),
     Value::Linear(v) => Self::Linear(v),
 }
-
-castable! {
-    Spacing: "linear or fractional",
-    Value::Length(v) => Self::Linear(v.into()),
-    Value::Relative(v) => Self::Linear(v.into()),
-    Value::Linear(v) => Self::Linear(v),
-    Value::Fractional(v) => Self::Fractional(v),
-}
diff --git a/src/library/page.rs b/src/library/page.rs
index 7e1bd05b..9dcb5ba3 100644
--- a/src/library/page.rs
+++ b/src/library/page.rs
@@ -3,14 +3,13 @@ use crate::style::{Paper, PaperClass};
 
 /// `page`: Configure pages.
 pub fn page(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
-    let paper = match args.named::<Spanned<Str>>("paper")?.or_else(|| args.find()) {
-        Some(name) => match Paper::from_name(&name.v) {
-            None => bail!(name.span, "invalid paper name"),
-            paper => paper,
-        },
-        None => None,
-    };
+    castable! {
+        Paper: "string",
+        Value::Str(string) => Paper::from_name(&string)
+            .ok_or("invalid paper name")?,
+    }
 
+    let paper = args.named::<Paper>("paper")?.or_else(|| args.find());
     let width = args.named("width")?;
     let height = args.named("height")?;
     let margins = args.named("margins")?;
diff --git a/src/library/spacing.rs b/src/library/spacing.rs
index 8ffd5e7a..23328c86 100644
--- a/src/library/spacing.rs
+++ b/src/library/spacing.rs
@@ -22,3 +22,11 @@ pub enum Spacing {
     /// A length that is the fraction of the remaining free space in the parent.
     Fractional(Fractional),
 }
+
+castable! {
+    Spacing: "linear or fractional",
+    Value::Length(v) => Self::Linear(v.into()),
+    Value::Relative(v) => Self::Linear(v.into()),
+    Value::Linear(v) => Self::Linear(v),
+    Value::Fractional(v) => Self::Fractional(v),
+}
diff --git a/src/library/text.rs b/src/library/text.rs
index b33a002d..17b33ca5 100644
--- a/src/library/text.rs
+++ b/src/library/text.rs
@@ -1,18 +1,22 @@
 use std::borrow::Cow;
 use std::ops::Range;
 
-use rustybuzz::UnicodeBuffer;
+use rustybuzz::{Feature, Tag, UnicodeBuffer};
 
 use super::prelude::*;
 use crate::font::{Face, FaceId, FontFamily, FontVariant};
 use crate::geom::{Dir, Em, Length, Point, Size};
-use crate::style::{Style, TextStyle};
+use crate::style::{
+    FontFeatures, NumberPosition, NumberStyle, NumberWidth, Style, TextStyle,
+};
 use crate::util::SliceExt;
 
 /// `font`: Configure the font.
 pub fn font(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
     struct FontDef(Rc<Vec<FontFamily>>);
     struct FamilyDef(Rc<Vec<String>>);
+    struct FeatureList(Vec<(String, u32)>);
+    struct StylisticSet(Option<u8>);
 
     castable! {
         FontDef: "font family or array of font families",
@@ -38,11 +42,73 @@ pub fn font(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
         )),
     }
 
+    castable! {
+        StylisticSet: "none or integer",
+        Value::None => Self(None),
+        Value::Int(v) => match v {
+            1..=20 => Self(Some(v as u8)),
+            _ => Err("must be between 1 and 20")?,
+        },
+    }
+
+    castable! {
+        NumberStyle: "auto or string",
+        Value::Auto => Self::Auto,
+        Value::Str(string) => match string.as_str() {
+            "lining" => Self::Lining,
+            "old-style" => Self::OldStyle,
+            _ => Err(r#"expected "lining" or "old-style""#)?,
+        },
+    }
+
+    castable! {
+        NumberWidth: "auto or string",
+        Value::Auto => Self::Auto,
+        Value::Str(string) => match string.as_str() {
+            "proportional" => Self::Proportional,
+            "tabular" => Self::Tabular,
+            _ => Err(r#"expected "proportional" or "tabular""#)?,
+        },
+    }
+
+    castable! {
+        NumberPosition: "string",
+        Value::Str(string) => match string.as_str() {
+            "normal" => Self::Normal,
+            "subscript" => Self::Subscript,
+            "superscript" => Self::Superscript,
+            _ => Err(r#"expected "normal", "subscript" or "superscript""#)?,
+        },
+    }
+
+    castable! {
+        FeatureList: "array of strings or dictionary mapping tags to integers",
+        Value::Array(values) => Self(values
+            .into_iter()
+            .filter_map(|v| v.cast().ok())
+            .map(|string: Str| (string.to_lowercase(), 1))
+            .collect()),
+        Value::Dict(values) => Self(values
+            .into_iter()
+            .filter_map(|(k, v)| {
+                if let Ok(value) = v.cast::<i64>() {
+                    Some((k.to_lowercase(), value as u32))
+                } else {
+                    None
+                }
+            })
+            .collect()),
+    }
+
     let list = args.named("family")?.or_else(|| {
         let families: Vec<_> = args.all().collect();
         (!families.is_empty()).then(|| FontDef(Rc::new(families)))
     });
 
+    let serif = args.named("serif")?;
+    let sans_serif = args.named("sans-serif")?;
+    let monospace = args.named("monospace")?;
+    let fallback = args.named("fallback")?;
     let size = args.named::<Linear>("size")?.or_else(|| args.find());
     let style = args.named("style")?;
     let weight = args.named("weight")?;
@@ -50,42 +116,33 @@ pub fn font(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
     let fill = args.named("fill")?.or_else(|| args.find());
     let top_edge = args.named("top-edge")?;
     let bottom_edge = args.named("bottom-edge")?;
-    let serif = args.named("serif")?;
-    let sans_serif = args.named("sans-serif")?;
-    let monospace = args.named("monospace")?;
-    let fallback = args.named("fallback")?;
-    let body = args.find::<Template>();
-
-    let f = move |style_: &mut Style| {
-        let text = style_.text_mut();
-
-        if let Some(size) = size {
-            text.size = size.resolve(text.size);
-        }
-
-        if let Some(style) = style {
-            text.variant.style = style;
-        }
-
-        if let Some(weight) = weight {
-            text.variant.weight = weight;
-        }
 
-        if let Some(stretch) = stretch {
-            text.variant.stretch = stretch;
-        }
+    let kerning = args.named("kerning")?;
+    let smallcaps = args.named("smallcaps")?;
+    let alternates = args.named("alternates")?;
+    let stylistic_set = args.named("stylistic-set")?;
+    let ligatures = args.named("ligatures")?;
+    let discretionary_ligatures = args.named("discretionary-ligatures")?;
+    let historical_ligatures = args.named("historical-ligatures")?;
+    let number_style = args.named("number-style")?;
+    let number_width = args.named("number-width")?;
+    let number_position = args.named("number-position")?;
+    let slashed_zero = args.named("slashed-zero")?;
+    let fractions = args.named("fractions")?;
+    let features = args.named("features")?;
 
-        if let Some(top_edge) = top_edge {
-            text.top_edge = top_edge;
-        }
+    let body = args.find::<Template>();
 
-        if let Some(bottom_edge) = bottom_edge {
-            text.bottom_edge = bottom_edge;
-        }
+    macro_rules! set {
+        ($target:expr => $source:expr) => {
+            if let Some(v) = $source {
+                $target = v;
+            }
+        };
+    }
 
-        if let Some(fill) = fill {
-            text.fill = Paint::Color(fill);
-        }
+    let f = move |style_: &mut Style| {
+        let text = style_.text_mut();
 
         if let Some(FontDef(list)) = &list {
             text.families_mut().list = list.clone();
@@ -103,8 +160,39 @@ pub fn font(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
             text.families_mut().monospace = monospace.clone();
         }
 
-        if let Some(fallback) = fallback {
-            text.fallback = fallback;
+        if let Some(size) = size {
+            text.size = size.resolve(text.size);
+        }
+
+        if let Some(fill) = fill {
+            text.fill = Paint::Color(fill);
+        }
+
+        set!(text.fallback => fallback);
+        set!(text.variant.style => style);
+        set!(text.variant.weight => weight);
+        set!(text.variant.stretch => stretch);
+        set!(text.top_edge => top_edge);
+        set!(text.bottom_edge => bottom_edge);
+
+        set!(text.features_mut().kerning => kerning);
+        set!(text.features_mut().smallcaps => smallcaps);
+        set!(text.features_mut().alternates => alternates);
+        set!(text.features_mut().ligatures.standard => ligatures);
+        set!(text.features_mut().ligatures.discretionary => discretionary_ligatures);
+        set!(text.features_mut().ligatures.historical => historical_ligatures);
+        set!(text.features_mut().numbers.style => number_style);
+        set!(text.features_mut().numbers.width => number_width);
+        set!(text.features_mut().numbers.position => number_position);
+        set!(text.features_mut().numbers.slashed_zero => slashed_zero);
+        set!(text.features_mut().numbers.fractions => fractions);
+
+        if let Some(StylisticSet(stylistic_set)) = stylistic_set {
+            text.features_mut().stylistic_set = stylistic_set;
+        }
+
+        if let Some(FeatureList(features)) = &features {
+            text.features_mut().raw = features.clone();
         }
     };
 
@@ -135,6 +223,7 @@ pub fn shape<'a>(
             style.families(),
             None,
             dir,
+            &tags(&style.features),
         );
     }
 
@@ -320,6 +409,7 @@ fn shape_segment<'a>(
     mut families: impl Iterator<Item = &'a str> + Clone,
     mut first_face: Option<FaceId>,
     dir: Dir,
+    tags: &[rustybuzz::Feature],
 ) {
     // Select the font family.
     let (face_id, fallback) = loop {
@@ -354,7 +444,7 @@ fn shape_segment<'a>(
 
     // Shape!
     let mut face = ctx.fonts.get(face_id);
-    let buffer = rustybuzz::shape(face.ttf(), &[], buffer);
+    let buffer = rustybuzz::shape(face.ttf(), tags, buffer);
     let infos = buffer.glyph_infos();
     let pos = buffer.glyph_positions();
 
@@ -427,6 +517,7 @@ fn shape_segment<'a>(
                 families.clone(),
                 first_face,
                 dir,
+                tags,
             );
 
             face = ctx.fonts.get(face_id);
@@ -475,3 +566,82 @@ fn measure(
 
     (Size::new(width, top + bottom), top)
 }
+
+/// Collect the tags of the OpenType features to apply.
+fn tags(features: &FontFeatures) -> Vec<Feature> {
+    let mut tags = vec![];
+    let mut feat = |tag, value| {
+        tags.push(Feature::new(Tag::from_bytes(tag), value, ..));
+    };
+
+    // Features that are on by default in Harfbuzz are only added if disabled.
+    if !features.kerning {
+        feat(b"kern", 0);
+    }
+
+    // Features that are off by default in Harfbuzz are only added if enabled.
+    if features.smallcaps {
+        feat(b"smcp", 1);
+    }
+
+    if features.alternates {
+        feat(b"salt", 1);
+    }
+
+    let set_tag;
+    if let Some(set) = features.stylistic_set {
+        if matches!(set, 1 ..= 20) {
+            set_tag = [b's', b's', b'0' + set / 10, b'0' + set % 10];
+            feat(&set_tag, 1);
+        }
+    }
+
+    if !features.ligatures.standard {
+        feat(b"liga", 0);
+        feat(b"clig", 0);
+    }
+
+    if features.ligatures.discretionary {
+        feat(b"dlig", 1);
+    }
+
+    if features.ligatures.historical {
+        feat(b"hilg", 1);
+    }
+
+    match features.numbers.style {
+        NumberStyle::Auto => {}
+        NumberStyle::Lining => feat(b"lnum", 1),
+        NumberStyle::OldStyle => feat(b"onum", 1),
+    }
+
+    match features.numbers.width {
+        NumberWidth::Auto => {}
+        NumberWidth::Proportional => feat(b"pnum", 1),
+        NumberWidth::Tabular => feat(b"tnum", 1),
+    }
+
+    match features.numbers.position {
+        NumberPosition::Normal => {}
+        NumberPosition::Subscript => feat(b"subs", 1),
+        NumberPosition::Superscript => feat(b"sups", 1),
+    }
+
+    if features.numbers.slashed_zero {
+        feat(b"zero", 1);
+    }
+
+    if features.numbers.fractions {
+        feat(b"frac", 1);
+    }
+
+    for (tag, value) in features.raw.iter() {
+        tags.push(Feature::new(
+            Tag::from_bytes_lossy(tag.as_bytes()),
+            *value,
+            ..,
+        ))
+    }
+
+    tags
+}
diff --git a/src/style/mod.rs b/src/style/mod.rs
index 755fb3e5..cb27181f 100644
--- a/src/style/mod.rs
+++ b/src/style/mod.rs
@@ -136,6 +136,8 @@ pub struct TextStyle {
     /// A list of font families with generic class definitions (the final
     /// family list also depends on `monospace`).
     pub families: Rc<FamilyStyle>,
+    /// OpenType features.
+    pub features: Rc<FontFeatures>,
     /// Whether 300 extra font weight should be added to what is defined by the
     /// `variant`.
     pub strong: bool,
@@ -197,6 +199,11 @@ impl TextStyle {
     pub fn families_mut(&mut self) -> &mut FamilyStyle {
         Rc::make_mut(&mut self.families)
     }
+
+    /// Access the font `features` mutably.
+    pub fn features_mut(&mut self) -> &mut FontFeatures {
+        Rc::make_mut(&mut self.features)
+    }
 }
 
 impl Default for TextStyle {
@@ -212,6 +219,7 @@ impl Default for TextStyle {
             bottom_edge: VerticalFontMetric::Baseline,
             fill: Paint::Color(Color::Rgba(RgbaColor::BLACK)),
             families: Rc::new(FamilyStyle::default()),
+            features: Rc::new(FontFeatures::default()),
             strong: false,
             emph: false,
             monospace: false,
@@ -250,3 +258,117 @@ impl Default for FamilyStyle {
         }
     }
 }
+
+/// Whether various kinds of ligatures should appear.
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
+pub struct FontFeatures {
+    /// Whether to apply kerning ("kern").
+    pub kerning: bool,
+    /// Whether the text should use small caps. ("smcp")
+    pub smallcaps: bool,
+    /// Whether to apply stylistic alternates. ("salt")
+    pub alternates: bool,
+    /// Which stylistic set to apply. ("ss00" - "ss20")
+    pub stylistic_set: Option<u8>,
+    /// Configuration of ligature features.
+    pub ligatures: LigatureFeatures,
+    /// Configuration of numbers features.
+    pub numbers: NumberFeatures,
+    /// Raw OpenType features to apply.
+    pub raw: Vec<(String, u32)>,
+}
+
+impl Default for FontFeatures {
+    fn default() -> Self {
+        Self {
+            kerning: true,
+            smallcaps: false,
+            alternates: false,
+            stylistic_set: None,
+            ligatures: LigatureFeatures::default(),
+            numbers: NumberFeatures::default(),
+            raw: vec![],
+        }
+    }
+}
+
+/// Whether various kinds of ligatures should appear.
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+pub struct LigatureFeatures {
+    /// Standard ligatures. ("liga", "clig")
+    pub standard: bool,
+    /// Ligatures that should be used sparringly. ("dlig")
+    pub discretionary: bool,
+    /// Historical ligatures. ("hlig")
+    pub historical: bool,
+}
+
+impl Default for LigatureFeatures {
+    fn default() -> Self {
+        Self {
+            standard: true,
+            discretionary: false,
+            historical: false,
+        }
+    }
+}
+
+/// Defines the style of numbers.
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+pub struct NumberFeatures {
+    /// Whether to use lining or old-style numbers.
+    pub style: NumberStyle,
+    /// Whether to use proportional or tabular numbers.
+    pub width: NumberWidth,
+    /// How to position numbers vertically.
+    pub position: NumberPosition,
+    /// Whether to have a slash through the zero glyph. ("zero")
+    pub slashed_zero: bool,
+    /// Whether to convert fractions. ("frac")
+    pub fractions: bool,
+}
+
+impl Default for NumberFeatures {
+    fn default() -> Self {
+        Self {
+            style: NumberStyle::Auto,
+            width: NumberWidth::Auto,
+            position: NumberPosition::Normal,
+            slashed_zero: false,
+            fractions: false,
+        }
+    }
+}
+
+/// How numbers / figures look.
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+pub enum NumberStyle {
+    /// Select the font's preference.
+    Auto,
+    /// Numbers that fit well with capital text. ("lnum")
+    Lining,
+    /// Numbers that fit well into flow of upper- and lowercase text. ("onum")
+    OldStyle,
+}
+
+/// The width of numbers / figures.
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+pub enum NumberWidth {
+    /// Select the font's preference.
+    Auto,
+    /// Number widths are glyph specific. ("pnum")
+    Proportional,
+    /// All numbers are of equal width / monospaced. ("tnum")
+    Tabular,
+}
+
+/// How to position numbers.
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+pub enum NumberPosition {
+    /// Numbers are positioned on the same baseline as text.
+    Normal,
+    /// Numbers are smaller and placed at the bottom. ("subs")
+    Subscript,
+    /// Numbers are smaller and placed at the top. ("sups")
+    Superscript,
+}
diff --git a/tests/ref/text/features.png b/tests/ref/text/features.png
new file mode 100644
index 00000000..90521427
--- /dev/null
+++ b/tests/ref/text/features.png
diff --git a/tests/typ/text/features.typ b/tests/typ/text/features.typ
new file mode 100644
index 00000000..10214bdb
--- /dev/null
+++ b/tests/typ/text/features.typ
@@ -0,0 +1,65 @@
+// Test OpenType features.
+
+---
+// Test turning kerning off.
+#font(kerning: true)[Tq] \
+#font(kerning: false)[Tq]
+
+---
+// Test smallcaps.
+#font("Roboto")
+#font(smallcaps: true)[Smallcaps]
+
+---
+// Test alternates and stylistic sets.
+#font("IBM Plex Serif")
+a vs #font(alternates: true)[a] \
+ß vs #font(stylistic-set: 5)[ß]
+
+---
+// Test ligatures.
+fi vs. #font(ligatures: false)[No fi] \
+
+---
+// Test number style.
+#font("Roboto")
+#font(number-style: "old-style") 0123456789 \
+#font(number-style: auto)[0123456789]
+
+---
+// Test number width.
+#font("Roboto")
+#font(number-width: "proportional")[0123456789] \
+#font(number-width: "tabular")[3456789123] \
+#font(number-width: "tabular")[0123456789]
+
+---
+// Test number position.
+#font("IBM Plex Sans")
+#font(number-position: "normal")[C2H4] \
+#font(number-position: "subscript")[C2H4] \
+#font(number-position: "superscript")[C2H4]
+
+---
+// Test extra number stuff.
+#font("IBM Plex Sans")
+0 vs. #font(slashed-zero: true)[0] \
+1/2 vs. #font(fractions: true)[1/2]
+
+---
+// Test raw features.
+#font("Roboto")
+#font(features: ("smcp",))[Smcp] \
+fi vs. #font(features: (liga: 0))[No fi]
+
+---
+// Error: 22-24 must be between 1 and 20
+#font(stylistic-set: 25)
+
+---
+// Error: 21-32 expected "lining" or "old-style"
+#font(number-style: "different")
+
+---
+// Error: 17-22 expected array of strings or dictionary mapping tags to integers, found boolean
+#font(features: false)