From: Juergen Spitzmueller <spitz@lyx.org>
Date: Fri, 9 Feb 2018 12:23:50 +0000 (+0100)
Subject: tex2lyx: normalize bib and bst paths
X-Git-Tag: 2.2.4~23
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a049bfef7adbe724bf0d4a410ae7e6220d2192f3;p=lyx.git

tex2lyx: normalize bib and bst paths

Fixes: #7637
(cherry picked from commit 3cc98a9bf6ed506d04b502863d6424d36cb778b5)
---

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index ce330a2b9f..3844fce398 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -4192,7 +4192,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 				// \nocite{*} option
 				btprint.clear();
 			}
-			os << "bibfiles " << '"' << p.verbatim_item() << '"' << "\n";
+			os << "bibfiles " << '"' << normalize_filename(p.verbatim_item()) << '"' << "\n";
 			// Do we have addcontentsline?
 			if (contentslineContent == "\\refname") {
 				BibOpts = "bibtotoc";
@@ -4202,9 +4202,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			// Do we have a bibliographystyle set?
 			if (!bibliographystyle.empty()) {
 				if (BibOpts.empty())
-					BibOpts = bibliographystyle;
+					BibOpts = normalize_filename(bibliographystyle);
 				else
-					BibOpts = BibOpts + ',' + bibliographystyle;
+					BibOpts = BibOpts + ',' + normalize_filename(bibliographystyle);
 				// clear it because each bibtex entry has its style
 				// and we need an empty string to handle \phantomsection
 				bibliographystyle.clear();
diff --git a/status.22x b/status.22x
index 6ac16cb5ec..197eee02b4 100644
--- a/status.22x
+++ b/status.22x
@@ -173,6 +173,8 @@ What's new
 
 - Fix import of \newtheorem* declarations (bug 10622).
 
+- Fix import of (specific) BibTeX paths (bug 7637).
+
 
 * ADVANCED FIND AND REPLACE