From 76e173b78b511b506b928c27ac360f75fa455747 Mon Sep 17 00:00:00 2001 From: frozolotl <44589151+frozolotl@users.noreply.github.com> Date: Fri, 24 Nov 2023 05:42:02 -0500 Subject: [PATCH] Allow multiple font paths in `TYPST_FONT_PATHS` (#2746) --- crates/typst-cli/src/args.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/crates/typst-cli/src/args.rs b/crates/typst-cli/src/args.rs index 2113e03cb..cfd1ae087 100644 --- a/crates/typst-cli/src/args.rs +++ b/crates/typst-cli/src/args.rs @@ -5,6 +5,10 @@ use semver::Version; use clap::{ArgAction, Args, Parser, Subcommand, ValueEnum}; +/// The character typically used to separate path components +/// in environment variables. +const ENV_PATH_SEP: char = if cfg!(windows) { ';' } else { ':' }; + /// The Typst compiler. #[derive(Debug, Clone, Parser)] #[clap(name = "typst", version = crate::typst_version(), author)] @@ -118,7 +122,7 @@ pub struct SharedArgs { long = "font-path", env = "TYPST_FONT_PATHS", value_name = "DIR", - action = ArgAction::Append, + value_delimiter = ENV_PATH_SEP, )] pub font_paths: Vec, @@ -139,7 +143,7 @@ pub struct FontsCommand { long = "font-path", env = "TYPST_FONT_PATHS", value_name = "DIR", - action = ArgAction::Append, + value_delimiter = ENV_PATH_SEP, )] pub font_paths: Vec,