fix read problems on win32

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2139 a592a061-630c-0410-9148-cb99ea01b6c8

src/ChangeLog

@@ -1,3 +1,9 @@
+2001-06-20  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* LaTeX.C (scanAuxFile):
+	(deplog): remove trailing \r when reading stream (useful under
+	win32)  
+
 2001-06-15  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* BufferView_pimpl.C (fitCursor): emit a signal updateParagraph.

src/LaTeX.C

@@ -407,6 +407,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
 	LRegex reg4("\\\\@input\\{([^}]+)\\}");
 
 	while (getline(ifs, token)) {
+		token = strip(token, '\r');
 		if (reg1.exact_match(token)) {
 			LRegex::SubMatches const & sub = reg1.exec(token);
 			string data = LSubstring(token, sub[1].first,
@@ -645,6 +646,7 @@ void LaTeX::deplog(DepTable & head)
 		string foundfile;
 		string token;
 		getline(ifs, token);
+		token = strip(token, '\r');
 		if (token.empty()) continue;
 		
 		if (reg1.exact_match(token)) {

src/support/ChangeLog

@@ -1,3 +1,8 @@
+2001-06-20  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* filetools.C (findtexfile): strip final \r if necessary (for
+	cygwin)
+
 2001-06-19  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* FileInfo.C:

src/support/filetools.C

@@ -1072,7 +1072,10 @@ findtexfile(string const & fil, string const & /*format*/)
         lyxerr[Debug::LATEX] << "kpse status = " << c.first << "\n"
 			     << "kpse result = `" << strip(c.second, '\n') 
 			     << "'" << endl;
-        return c.first != -1 ? strip(c.second, '\n') : string();
+	if (c.first != -1) 
+		return strip(strip(c.second, '\n'), '\r');
+	else
+		return string();
 }