Merge 333dfd505c3145b6e6db3365bc9667ca505604b3 into 5661c20580584d86897d139cdeffd6fb1a9a6d5c

README.md

@@ -173,11 +173,8 @@ typst help
 typst help watch
 ```
 
-If you prefer an integrated IDE-like experience with autocompletion and instant 
+If you prefer an integrated IDE-like experience with autocompletion and instant
-preview, you can also check out our [free web app][app]. Alternatively, there is 
+preview, you can also check out [Typst's free web app][app].
-a community-created language server called 
-[Tinymist](https://myriad-dreamin.github.io/tinymist/) which is integrated into 
-various editor extensions.
 
 ## Community
 The main places where the community gathers are our [Forum][forum] and our

crates/typst-html/src/rules.rs

@@ -14,8 +14,8 @@ use typst_library::model::{
     RefElem, StrongElem, TableCell, TableElem, TermsElem,
 };
 use typst_library::text::{
-    HighlightElem, LinebreakElem, OverlineElem, RawElem, RawLine, SmallcapsElem,
+    HighlightElem, LinebreakElem, OverlineElem, RawElem, RawLine, SpaceElem, StrikeElem,
-    SpaceElem, StrikeElem, SubElem, SuperElem, UnderlineElem,
+    SubElem, SuperElem, UnderlineElem,
 };
 use typst_library::visualize::ImageElem;
 
@@ -47,7 +47,6 @@ pub fn register(rules: &mut NativeRuleMap) {
     rules.register(Html, OVERLINE_RULE);
     rules.register(Html, STRIKE_RULE);
     rules.register(Html, HIGHLIGHT_RULE);
-    rules.register(Html, SMALLCAPS_RULE);
     rules.register(Html, RAW_RULE);
     rules.register(Html, RAW_LINE_RULE);
 
@@ -391,20 +390,6 @@ const STRIKE_RULE: ShowFn<StrikeElem> =
 const HIGHLIGHT_RULE: ShowFn<HighlightElem> =
     |elem, _, _| Ok(HtmlElem::new(tag::mark).with_body(Some(elem.body.clone())).pack());
 
-const SMALLCAPS_RULE: ShowFn<SmallcapsElem> = |elem, _, styles| {
-    Ok(HtmlElem::new(tag::span)
-        .with_attr(
-            attr::style,
-            if elem.all.get(styles) {
-                "font-variant-caps: all-small-caps"
-            } else {
-                "font-variant-caps: small-caps"
-            },
-        )
-        .with_body(Some(elem.body.clone()))
-        .pack())
-};
-
 const RAW_RULE: ShowFn<RawElem> = |elem, _, styles| {
     let lines = elem.lines.as_deref().unwrap_or_default();
 

crates/typst-library/src/visualize/color.rs

@@ -797,9 +797,7 @@ impl Color {
         components
     }
 
-    /// Returns the constructor function for this color's space.
+    /// Returns the constructor function for this color's space:
-    ///
-    /// Returns one of:
     /// - [`luma`]($color.luma)
     /// - [`oklab`]($color.oklab)
     /// - [`oklch`]($color.oklch)

docs/src/lib.rs

@@ -242,7 +242,7 @@ fn category_page(resolver: &dyn Resolver, category: Category) -> PageModel {
             items.push(CategoryItem {
                 name: group.name.clone(),
                 route: subpage.route.clone(),
-                oneliner: oneliner(docs),
+                oneliner: oneliner(docs).into(),
                 code: true,
             });
             children.push(subpage);
@@ -296,7 +296,7 @@ fn category_page(resolver: &dyn Resolver, category: Category) -> PageModel {
                 items.push(CategoryItem {
                     name: name.into(),
                     route: subpage.route.clone(),
-                    oneliner: oneliner(func.docs().unwrap_or_default()),
+                    oneliner: oneliner(func.docs().unwrap_or_default()).into(),
                     code: true,
                 });
                 children.push(subpage);
@@ -306,7 +306,7 @@ fn category_page(resolver: &dyn Resolver, category: Category) -> PageModel {
                 items.push(CategoryItem {
                     name: ty.short_name().into(),
                     route: subpage.route.clone(),
-                    oneliner: oneliner(ty.docs()),
+                    oneliner: oneliner(ty.docs()).into(),
                     code: true,
                 });
                 children.push(subpage);
@@ -637,7 +637,7 @@ fn group_page(
     let item = CategoryItem {
         name: group.name.clone(),
         route: model.route.clone(),
-        oneliner: oneliner(&group.details),
+        oneliner: oneliner(&group.details).into(),
         code: false,
     };
 
@@ -772,24 +772,8 @@ pub fn urlify(title: &str) -> EcoString {
 }
 
 /// Extract the first line of documentation.
-fn oneliner(docs: &str) -> EcoString {
+fn oneliner(docs: &str) -> &str {
-    let paragraph = docs.split("\n\n").next().unwrap_or_default();
+    docs.lines().next().unwrap_or_default()
-    let mut depth = 0;
-    let mut period = false;
-    let mut end = paragraph.len();
-    for (i, c) in paragraph.char_indices() {
-        match c {
-            '(' | '[' | '{' => depth += 1,
-            ')' | ']' | '}' => depth -= 1,
-            '.' if depth == 0 => period = true,
-            c if period && c.is_whitespace() && !docs[..i].ends_with("e.g.") => {
-                end = i;
-                break;
-            }
-            _ => period = false,
-        }
-    }
-    EcoString::from(&docs[..end]).replace("\r\n", " ").replace("\n", " ")
 }
 
 /// The order of types in the documentation.

docs/src/model.rs

@@ -86,7 +86,7 @@ pub struct FuncModel {
     pub name: EcoString,
     pub title: &'static str,
     pub keywords: &'static [&'static str],
-    pub oneliner: EcoString,
+    pub oneliner: &'static str,
     pub element: bool,
     pub contextual: bool,
     pub deprecation: Option<&'static str>,
@@ -139,7 +139,7 @@ pub struct TypeModel {
     pub name: &'static str,
     pub title: &'static str,
     pub keywords: &'static [&'static str],
-    pub oneliner: EcoString,
+    pub oneliner: &'static str,
     pub details: Html,
     pub constructor: Option<FuncModel>,
     pub scope: Vec<FuncModel>,

flake.nix

@@ -127,10 +127,6 @@
           checks = self'.checks;
           inputsFrom = [ typst ];
 
-          buildInputs = with pkgs; [
-            rust-analyzer
-          ];
-
           packages = [
             # A script for quickly running tests.
             # See https://github.com/typst/typst/blob/main/tests/README.md#making-an-alias

tests/ref/html/smallcaps-all.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-  </head>
-  <body>
-    <p><span style="font-variant-caps: small-caps">Test 012</span><br><span style="font-variant-caps: all-small-caps">Test 012</span></p>
-  </body>
-</html>

tests/suite/text/smallcaps.typ

@@ -11,6 +11,6 @@
 #show smallcaps: set text(fill: red)
 #smallcaps[Smallcaps]
 
---- smallcaps-all render html ---
+--- smallcaps-all ---
 #smallcaps(all: false)[Test 012] \
 #smallcaps(all: true)[Test 012]