Skip to content

Commit 01845bf

Browse files
committed
maybe fix?
1 parent 105dca8 commit 01845bf

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

rustex/src/kpathsea.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ impl Kpathsea {
129129
}
130130
let rs : Vec<String> = std::str::from_utf8(std::process::Command::new("kpsewhich")
131131
.args(vec!("-a","texmf.cnf")).output().expect("kpsewhich not found!")
132-
.stdout.as_slice()).unwrap().split("\n").map(|x| x.trim().to_string()).filter(|s| !s.is_empty()).collect();
132+
.stdout.as_slice()).unwrap().split(|c| c=='\r' || c == '\n').map(|x| x.trim().to_string()).filter(|s| !s.is_empty()).collect();
133133
for r in rs {
134134
let p = PathBuf::from(r);
135135
if p.exists() {
136-
let lines : Vec<String> = std::str::from_utf8(std::fs::read(p).unwrap().as_slice()).unwrap().split("\n").map(|x| x.trim().to_string()).collect();
136+
let lines : Vec<String> = std::str::from_utf8(std::fs::read(p).unwrap().as_slice()).unwrap().split(|c| c=='\r' || c == '\n').map(|x| x.trim().to_string()).collect();
137137
for l in lines {
138138
if !l.starts_with("%") && !l.is_empty() {
139139
let mut kb : Vec<String> = l.split("=").map(|x| x.trim().to_string()).collect();
@@ -150,10 +150,10 @@ impl Kpathsea {
150150
}
151151
}
152152
let mut filestrs : Vec<String> = vec!(
153-
vars.get("VARTEXFONTS").map(|x| x.clone()),
154-
vars.get("VFFONTS").map(|x| x.clone()),
155-
vars.get("TFMFONTS").map(|x| x.clone()),
156-
std::env::vars().find(|a| a.0 == "TEXINPUTS").map(|x| x.1.clone()),
153+
vars.get("VARTEXFONTS").map(|x| x.replace("\\","/")),
154+
vars.get("VFFONTS").map(|x| x.replace("\\","/")),
155+
vars.get("TFMFONTS").map(|x| x.replace("\\","/")),
156+
std::env::vars().find(|a| a.0 == "TEXINPUTS").map(|x| x.1.replace("\\","/")),
157157
vars.get("TEXINPUTS").map(|x| x.clone())
158158
).into_iter().flatten().collect();
159159
vars.insert("progname".to_string(),"pdflatex".to_string());

rustex/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ fn run() {
8686
println!("Done.");
8787
state
8888
});
89-
state.commands.get(&"documentclass".into()).expect("");
89+
state.commands.get(&"documentclass".into()).expect("\\documentclass not defined. Something went wrong :((");
9090
println!("\n\nSuccess! \\o/");
9191
return
9292
}

0 commit comments

Comments
 (0)