The speed patch: redraw only rows that have changed

[lyx.git] / src / insets / ExternalSupport.C

diff --git a/src/insets/ExternalSupport.C b/src/insets/ExternalSupport.C
index a1068f9d11e62e7f4cebf3195d400f8b8986a864..6a64f2867557eddf363ccf46b4fdfe5a4ad5fc9a 100644 (file)
--- a/src/insets/ExternalSupport.C
+++ b/src/insets/ExternalSupport.C
@@ -28,6 +28,7 @@
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 #include "support/lyxlib.h"
+#include "support/os.h"
 #include "support/package.h"
 #include "support/path.h"
 
@@ -60,9 +61,30 @@ void editExternal(InsetExternalParams const & params, Buffer const & buffer)
 }
 
 
+namespace {
+
+string const subst_path(string const & input,
+                       string const & placeholder,
+                       string const & path,
+                        bool use_latex_path,
+                        support::latex_path_extension ext = support::PROTECT_EXTENSION,
+                        support::latex_path_dots dots = support::LEAVE_DOTS)
+{
+       if (input.find(placeholder) == string::npos)
+               return input;
+       string const path2 = use_latex_path ?
+               support::latex_path(path, ext, dots) :
+               support::os::external_path(path);
+       return support::subst(input, placeholder, path2);
+}
+
+} // namespace anon
+
+
 string const doSubstitution(InsetExternalParams const & params,
                            Buffer const & buffer, string const & s,
-                            bool external_in_tmpdir,
+                            bool use_latex_path,
+                           bool external_in_tmpdir,
                             Substitute what)
 {
        Buffer const * m_buffer = buffer.getMasterBuffer();
@@ -92,35 +114,55 @@ string const doSubstitution(InsetExternalParams const & params,
                if (relToParentPath == "./")
                        relToParentPath.clear();
 
-               result = support::subst(result, "$$FPath", filepath);
-               result = support::subst(result, "$$AbsPath", abspath);
-               result = support::subst(result, "$$RelPathMaster",
-                                       relToMasterPath);
-               result = support::subst(result, "$$RelPathParent",
-                                       relToParentPath);
+               result = subst_path(result, "$$FPath", filepath,
+                                   use_latex_path,
+                                   support::PROTECT_EXTENSION,
+                                   support::ESCAPE_DOTS);
+               result = subst_path(result, "$$AbsPath", abspath,
+                                   use_latex_path,
+                                   support::PROTECT_EXTENSION,
+                                   support::ESCAPE_DOTS);
+               result = subst_path(result, "$$RelPathMaster",
+                                   relToMasterPath, use_latex_path,
+                                   support::PROTECT_EXTENSION,
+                                   support::ESCAPE_DOTS);
+               result = subst_path(result, "$$RelPathParent",
+                                   relToParentPath, use_latex_path,
+                                   support::PROTECT_EXTENSION,
+                                   support::ESCAPE_DOTS);
                if (support::AbsolutePath(filename)) {
-                       result = support::subst(result, "$$AbsOrRelPathMaster",
-                                               abspath);
-                       result = support::subst(result, "$$AbsOrRelPathParent",
-                                               abspath);
+                       result = subst_path(result, "$$AbsOrRelPathMaster",
+                                           abspath, use_latex_path,
+                                           support::PROTECT_EXTENSION,
+                                           support::ESCAPE_DOTS);
+                       result = subst_path(result, "$$AbsOrRelPathParent",
+                                           abspath, use_latex_path,
+                                           support::PROTECT_EXTENSION,
+                                           support::ESCAPE_DOTS);
                } else {
-                       result = support::subst(result, "$$AbsOrRelPathMaster",
-                                               relToMasterPath);
-                       result = support::subst(result, "$$AbsOrRelPathParent",
-                                               relToParentPath);
+                       result = subst_path(result, "$$AbsOrRelPathMaster",
+                                           relToMasterPath, use_latex_path,
+                                           support::PROTECT_EXTENSION,
+                                           support::ESCAPE_DOTS);
+                       result = subst_path(result, "$$AbsOrRelPathParent",
+                                           relToParentPath, use_latex_path,
+                                           support::PROTECT_EXTENSION,
+                                           support::ESCAPE_DOTS);
                }
        }
 
        if (what == PATHS)
                return result;
 
-       result = support::subst(result, "$$FName", filename);
-       result = support::subst(result, "$$Basename", basename);
-       result = support::subst(result, "$$Extension",
-                       '.' + support::GetExtension(filename));
-       result = support::subst(result, "$$Tempname", params.tempname());
-       result = support::subst(result, "$$Sysdir",
-                               support::package().system_support());
+       result = subst_path(result, "$$FName", filename, use_latex_path,
+                           support::EXCLUDE_EXTENSION);
+       result = subst_path(result, "$$Basename", basename, use_latex_path,
+                           support::PROTECT_EXTENSION, support::ESCAPE_DOTS);
+       result = subst_path(result, "$$Extension",
+                       '.' + support::GetExtension(filename), use_latex_path);
+       result = subst_path(result, "$$Tempname", params.tempname(), use_latex_path);
+       result = subst_path(result, "$$Sysdir",
+                               support::package().system_support(), use_latex_path);
 
        // Handle the $$Contents(filename) syntax
        if (support::contains(result, "$$Contents(\"")) {
@@ -231,7 +273,7 @@ void updateExternal(InsetExternalParams const & params,
        // the generated file (always in the temp dir)
        string const to_file = doSubstitution(params, buffer,
                                              outputFormat.updateResult,
-                                             true);
+                                             false, true);
        string const abs_to_file =
                support::MakeAbsPath(to_file, m_buffer->temppath());
 
@@ -246,7 +288,7 @@ void updateExternal(InsetExternalParams const & params,
                for (; fit != fend; ++fit) {
                        string const source = support::MakeAbsPath(
                                        doSubstitution(params, buffer, *fit,
-                                                      true),
+                                                      false, true),
                                        m_buffer->temppath());
                        // The path of the referenced file is never the
                        // temp path, but the filename may be the mangled
@@ -254,10 +296,10 @@ void updateExternal(InsetExternalParams const & params,
                        // paths and names separately.
                        string file = support::subst(*fit, "$$FName",
                                        "$$FPath$$Basename$$Extension");
-                       file = doSubstitution(params, buffer, file, false,
+                       file = doSubstitution(params, buffer, file, false, false,
                                              PATHS);
                        file = doSubstitution(params, buffer, file,
-                                             external_in_tmpdir,
+                                             false, external_in_tmpdir,
                                              ALL_BUT_PATHS);
                        // if file is a relative name, it is interpreted
                        // relative to the master document.
@@ -273,7 +315,7 @@ void updateExternal(InsetExternalParams const & params,
                support::ChangeExtension(to_file, string());
        /* bool const success = */
                converters.convert(&buffer, temp_file, to_file_base,
-                                  from_format, to_format);
+                                  from_format, to_format, true);
        // return success
 }
 
@@ -309,12 +351,13 @@ int writeExternal(InsetExternalParams const & params,
 
        updateExternal(params, format, buffer, exportdata, external_in_tmpdir);
 
+       bool const use_latex_path = format == "LaTeX";
        string str = doSubstitution(params, buffer, cit->second.product,
-                                   external_in_tmpdir);
+                                   use_latex_path, external_in_tmpdir);
        str = substituteCommands(params, str, format);
        str = substituteOptions(params, str, format);
        os << str;
-       return int(lyx::count(str.begin(), str.end(),'\n') + 1);
+       return int(lyx::count(str.begin(), str.end(),'\n'));
 }
 
 namespace {