From 3c15d4e3bd03d26d6e12d643b28212b200060dee Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 8 Oct 2001 12:37:39 +0000
Subject: [PATCH] more win32 port integration

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2845 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/ChangeLog           |  4 ++++
 src/LaTeX.C             | 15 ++++++++++++++-
 src/support/ChangeLog   |  4 ++++
 src/support/filetools.C |  5 ++++-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 0cb42ed1bf..71b2888ac3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-02  Claus Hentschel  <claus.hentschel@mbau.fh-hannover.de>
+
+	* LaTeX.C (deplog): add another regex for MikTeX
+
 2001-10-05  Adrien Rebollo  <adrien.rebollo@gmx.fr>
 
 	* lyxrc.C (set_font_norm_type): support iso8859-3
diff --git a/src/LaTeX.C b/src/LaTeX.C
index 824d297082..03dcc49b97 100644
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -18,8 +18,9 @@
 #endif
 #include <fstream>
 
-#include "support/filetools.h"
 #include "LaTeX.h"
+#include "support/filetools.h"
+#include "support/os.h"
 #include "support/FileInfo.h"
 #include "debug.h"
 #include "support/lyxlib.h"
@@ -649,6 +650,11 @@ void LaTeX::deplog(DepTable & head)
 	LRegex reg2("File: ([^ ]+).*");
 	LRegex reg3("No file ([^ ]+)\\..*");
 	LRegex reg4("\\\\openout[0-9]+.*=.*`([^ ]+)'\\..*");
+	// If an index should be created, MikTex does not write a line like
+	//    \openout# = 'sample,idx'.
+	// but intstead only a line like this into the log:
+	//   Writing index file sample.idx
+	LRegex reg5("Writing index file ([^ ]+).*");
 	LRegex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
 	
 	ifstream ifs(logfile.c_str());
@@ -680,10 +686,17 @@ void LaTeX::deplog(DepTable & head)
 			LRegex::SubMatches const & sub = reg4.exec(token);
 			foundfile = LSubstring(token, sub[1].first,
 					       sub[1].second);
+		} else if (reg5.exact_match(token)) {
+			LRegex::SubMatches const & sub = reg5.exec(token);
+			foundfile = LSubstring(token, sub[1].first,
+					       sub[1].second);
 		} else {
 			continue;
 		}
 
+		// convert from native os path to unix path
+		foundfile = os::internal_path(foundfile);
+		
 		lyxerr[Debug::DEPEND] << "Found file: " 
 				      << foundfile << endl;
 		
diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index ced558adac..0f0fb9edb5 100644
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* filetools.C (findtexfile): apply os::internal_path to the result.
+
 2001-07-02  Claus Hentschel  <claus.hentschel@mbau.fh-hannover.de>
 
 	* os_win32.C: 
diff --git a/src/support/filetools.C b/src/support/filetools.C
index 6ac637f7d2..3eef6694ea 100644
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -1076,8 +1076,11 @@ findtexfile(string const & fil, string const & /*format*/)
         lyxerr[Debug::LATEX] << "kpse status = " << c.first << "\n"
 			     << "kpse result = `" << strip(c.second, '\n') 
 			     << "'" << endl;
+	string fullpath;
 	if (c.first != -1) 
-		return strip(strip(c.second, '\n'), '\r');
+		fullpath = os::internal_path(strip(strip(c.second,
+							 '\n'),
+						   '\r'));
 	else
 		return string();
 }
-- 
2.39.2