some fixes for filepath

Author: nschloe

src/tikzplotlib/_files.py

@@ -1,9 +1,13 @@
-import pathlib
+from pathlib import Path
 
 
 def _gen_filepath(data, nb_key, ext):
-    name = data["base name"] + f"-{data[nb_key]:03d}{ext}"
-    return pathlib.Path(data["output dir"]) / name
+    rel_filepath = Path(f"{data['base name']}-{data[nb_key]:03d}{ext}")
+
+    if data["rel data path"]:
+        rel_filepath = Path(data["rel data path"]) / rel_filepath
+
+    return Path(data["output dir"]) / rel_filepath, rel_filepath
 
 
 def new_filepath(data, file_kind, ext):
@@ -25,19 +29,12 @@ def new_filepath(data, file_kind, ext):
     if nb_key not in data.keys():
         data[nb_key] = -1
 
-    data[nb_key] = data[nb_key] + 1
-    filepath = _gen_filepath(data, nb_key, ext)
+    data[nb_key] += 1
+    filepath, rel_filepath = _gen_filepath(data, nb_key, ext)
     if not data["override externals"]:
         # Make sure not to overwrite anything.
-        file_exists = filepath.is_file()
-        while file_exists:
-            data[nb_key] = data[nb_key] + 1
-            filepath = _gen_filepath(data, nb_key, ext)
-            file_exists = filepath.is_file()
-
-    if data["rel data path"]:
-        rel_filepath = pathlib.Path(data["rel data path"]) / filepath
-    else:
-        rel_filepath = filepath.name
+        while filepath.is_file():
+            data[nb_key] += 1
+            filepath, rel_filepath = _gen_filepath(data, nb_key, ext)
 
     return filepath, rel_filepath

src/tikzplotlib/_image.py

@@ -52,9 +52,13 @@ def draw_image(data, obj):
     # Explicitly use \pgfimage as includegrapics command, as the default
     # \includegraphics fails unexpectedly in some cases
     ff = data["float format"]
+    # Always use slash in file paths, see
+    # <https://tex.stackexchange.com/a/18923/13262>
+    # <https://github.com/nschloe/tikzplotlib/issues/509>
+    posix_filepath = rel_filepath.as_posix()
     content.append(
         "\\addplot graphics [includegraphics cmd=\\pgfimage,"
         f"xmin={extent[0]:{ff}}, xmax={extent[1]:{ff}}, "
-        f"ymin={extent[2]:{ff}}, ymax={extent[3]:{ff}}] {{{rel_filepath}}};\n"
+        f"ymin={extent[2]:{ff}}, ymax={extent[3]:{ff}}] {{{posix_filepath}}};\n"
     )
     return data, content

src/tikzplotlib/_quadmesh.py

@@ -53,10 +53,11 @@ def draw_quadmesh(data, obj):
     # Explicitly use \pgfimage as includegrapics command, as the default
     # \includegraphics fails unexpectedly in some cases
     ff = data["float format"]
+    posix_filepath = rel_filepath.as_posix()
     content.append(
         "\\addplot graphics [includegraphics cmd=\\pgfimage,"
         f"xmin={extent[0]:{ff}}, xmax={extent[1]:{ff}}, "
-        f"ymin={extent[2]:{ff}}, ymax={extent[3]:{ff}}] {{{rel_filepath}}};\n"
+        f"ymin={extent[2]:{ff}}, ymax={extent[3]:{ff}}] {{{posix_filepath}}};\n"
     )
 
     return data, content

tests/test_viridis.py

@@ -16,4 +16,9 @@ def plot():
 def test():
     from .helpers import assert_equality
 
-    assert_equality(plot, __file__[:-3] + "_reference.tex")
+    # test relative data path
+    assert_equality(
+        plot,
+        __file__[:-3] + "_reference.tex",
+        # tex_relative_path_to_data="data/files"
+    )