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 ce330a2b9ffe97a21a1c0da1ac0093632469fdd6..3844fce398bff7480935b6bd00aed0bf6368992a 100644 (file)
--- 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 6ac16cb5ecc58c66d08037764c7c69e5d73d67f5..197eee02b45e588aaae40b31bdb300f02c596e03 100644 (file)
--- 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