diff options
Diffstat (limited to 'crates/typst-library/src')
| -rw-r--r-- | crates/typst-library/src/compute/construct.rs | 2 | ||||
| -rw-r--r-- | crates/typst-library/src/compute/data.rs | 12 | ||||
| -rw-r--r-- | crates/typst-library/src/meta/bibliography.rs | 2 | ||||
| -rw-r--r-- | crates/typst-library/src/text/raw.rs | 4 | ||||
| -rw-r--r-- | crates/typst-library/src/visualize/image.rs | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/crates/typst-library/src/compute/construct.rs b/crates/typst-library/src/compute/construct.rs index 59a867a7..23f0c225 100644 --- a/crates/typst-library/src/compute/construct.rs +++ b/crates/typst-library/src/compute/construct.rs @@ -935,7 +935,7 @@ pub fn plugin( vm: &mut Vm, ) -> SourceResult<Plugin> { let Spanned { v: path, span } = path; - let id = vm.location().join(&path).at(span)?; + let id = vm.resolve_path(&path).at(span)?; let data = vm.world().file(id).at(span)?; Plugin::new(data).at(span) } diff --git a/crates/typst-library/src/compute/data.rs b/crates/typst-library/src/compute/data.rs index 944baff3..cd28d61e 100644 --- a/crates/typst-library/src/compute/data.rs +++ b/crates/typst-library/src/compute/data.rs @@ -37,7 +37,7 @@ pub fn read( vm: &mut Vm, ) -> SourceResult<Readable> { let Spanned { v: path, span } = path; - let id = vm.location().join(&path).at(span)?; + let id = vm.resolve_path(&path).at(span)?; let data = vm.world().file(id).at(span)?; Ok(match encoding { None => Readable::Bytes(data), @@ -130,7 +130,7 @@ pub fn csv( vm: &mut Vm, ) -> SourceResult<Array> { let Spanned { v: path, span } = path; - let id = vm.location().join(&path).at(span)?; + let id = vm.resolve_path(&path).at(span)?; let data = vm.world().file(id).at(span)?; csv_decode(Spanned::new(Readable::Bytes(data), span), delimiter) } @@ -262,7 +262,7 @@ pub fn json( vm: &mut Vm, ) -> SourceResult<Value> { let Spanned { v: path, span } = path; - let id = vm.location().join(&path).at(span)?; + let id = vm.resolve_path(&path).at(span)?; let data = vm.world().file(id).at(span)?; json_decode(Spanned::new(Readable::Bytes(data), span)) } @@ -350,7 +350,7 @@ pub fn toml( vm: &mut Vm, ) -> SourceResult<Value> { let Spanned { v: path, span } = path; - let id = vm.location().join(&path).at(span)?; + let id = vm.resolve_path(&path).at(span)?; let data = vm.world().file(id).at(span)?; toml_decode(Spanned::new(Readable::Bytes(data), span)) @@ -462,7 +462,7 @@ pub fn yaml( vm: &mut Vm, ) -> SourceResult<Value> { let Spanned { v: path, span } = path; - let id = vm.location().join(&path).at(span)?; + let id = vm.resolve_path(&path).at(span)?; let data = vm.world().file(id).at(span)?; yaml_decode(Spanned::new(Readable::Bytes(data), span)) } @@ -568,7 +568,7 @@ pub fn xml( vm: &mut Vm, ) -> SourceResult<Value> { let Spanned { v: path, span } = path; - let id = vm.location().join(&path).at(span)?; + let id = vm.resolve_path(&path).at(span)?; let data = vm.world().file(id).at(span)?; xml_decode(Spanned::new(Readable::Bytes(data), span)) } diff --git a/crates/typst-library/src/meta/bibliography.rs b/crates/typst-library/src/meta/bibliography.rs index ed51058d..164b1c11 100644 --- a/crates/typst-library/src/meta/bibliography.rs +++ b/crates/typst-library/src/meta/bibliography.rs @@ -58,7 +58,7 @@ pub struct BibliographyElem { let data = paths.0 .iter() .map(|path| { - let id = vm.location().join(path).at(span)?; + let id = vm.resolve_path(path).at(span)?; vm.world().file(id).at(span) }) .collect::<SourceResult<Vec<Bytes>>>()?; diff --git a/crates/typst-library/src/text/raw.rs b/crates/typst-library/src/text/raw.rs index 063461a4..1b4a4223 100644 --- a/crates/typst-library/src/text/raw.rs +++ b/crates/typst-library/src/text/raw.rs @@ -490,7 +490,7 @@ fn parse_syntaxes( .0 .iter() .map(|path| { - let id = vm.location().join(path).at(span)?; + let id = vm.resolve_path(path).at(span)?; vm.world().file(id).at(span) }) .collect::<SourceResult<Vec<Bytes>>>()?; @@ -522,7 +522,7 @@ fn parse_theme( }; // Load theme file. - let id = vm.location().join(&path).at(span)?; + let id = vm.resolve_path(&path).at(span)?; let data = vm.world().file(id).at(span)?; // Check that parsing works. diff --git a/crates/typst-library/src/visualize/image.rs b/crates/typst-library/src/visualize/image.rs index 6ee930a7..5e6ac2d2 100644 --- a/crates/typst-library/src/visualize/image.rs +++ b/crates/typst-library/src/visualize/image.rs @@ -44,7 +44,7 @@ pub struct ImageElem { #[parse( let Spanned { v: path, span } = args.expect::<Spanned<EcoString>>("path to image file")?; - let id = vm.location().join(&path).at(span)?; + let id = vm.resolve_path(&path).at(span)?; let data = vm.world().file(id).at(span)?; path )] |
