@@ -129,11 +129,11 @@ impl Kpathsea {
129
129
}
130
130
let rs : Vec < String > = std:: str:: from_utf8 ( std:: process:: Command :: new ( "kpsewhich" )
131
131
. 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 ( ) ;
133
133
for r in rs {
134
134
let p = PathBuf :: from ( r) ;
135
135
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 ( ) ;
137
137
for l in lines {
138
138
if !l. starts_with ( "%" ) && !l. is_empty ( ) {
139
139
let mut kb : Vec < String > = l. split ( "=" ) . map ( |x| x. trim ( ) . to_string ( ) ) . collect ( ) ;
@@ -150,10 +150,10 @@ impl Kpathsea {
150
150
}
151
151
}
152
152
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 ( " \\ " , "/" ) ) ,
157
157
vars. get( "TEXINPUTS" ) . map( |x| x. clone( ) )
158
158
) . into_iter ( ) . flatten ( ) . collect ( ) ;
159
159
vars. insert ( "progname" . to_string ( ) , "pdflatex" . to_string ( ) ) ;
0 commit comments