hopefully fix tex2lyx linking.

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

diff --git a/src/insets/ExternalSupport.C b/src/insets/ExternalSupport.C
index 17cb9ba44dda8a28a081b42a3112548100c0bb76..087ac5d9f3a54630fb2091fd9c4bf724a91261e4 100644 (file)
--- a/src/insets/ExternalSupport.C
+++ b/src/insets/ExternalSupport.C
@@ -32,13 +32,7 @@
 #include "support/package.h"
 #include "support/path.h"
 
-#include "support/std_ostream.h"
-
-namespace support = lyx::support;
-
 using std::endl;
-
-using std::ostream;
 using std::string;
 using std::vector;
 
@@ -94,23 +88,23 @@ string const doSubstitution(InsetExternalParams const & params,
        string const filename = external_in_tmpdir ?
                params.filename.mangledFilename() :
                params.filename.outputFilename(parentpath);
-       string const basename = support::ChangeExtension(
-                       support::OnlyFilename(filename), string());
-       string const absname = support::MakeAbsPath(filename, parentpath);
+       string const basename = support::changeExtension(
+                       support::onlyFilename(filename), string());
+       string const absname = support::makeAbsPath(filename, parentpath);
 
        string result = s;
        if (what != ALL_BUT_PATHS) {
-               string const filepath = support::OnlyPath(filename);
-               string const abspath = support::OnlyPath(absname);
+               string const filepath = support::onlyPath(filename);
+               string const abspath = support::onlyPath(absname);
                string const masterpath = external_in_tmpdir ?
                        m_buffer->temppath() :
                        m_buffer->filePath();
-               string relToMasterPath = support::OnlyPath(
-                               support::MakeRelPath(absname, masterpath));
+               string relToMasterPath = support::onlyPath(
+                               support::makeRelPath(absname, masterpath));
                if (relToMasterPath == "./")
                        relToMasterPath.clear();
-               string relToParentPath = support::OnlyPath(
-                               support::MakeRelPath(absname, parentpath));
+               string relToParentPath = support::onlyPath(
+                               support::makeRelPath(absname, parentpath));
                if (relToParentPath == "./")
                        relToParentPath.clear();
 
@@ -130,7 +124,7 @@ string const doSubstitution(InsetExternalParams const & params,
                                    relToParentPath, use_latex_path,
                                    support::PROTECT_EXTENSION,
                                    support::ESCAPE_DOTS);
-               if (support::AbsolutePath(filename)) {
+               if (support::absolutePath(filename)) {
                        result = subst_path(result, "$$AbsOrRelPathMaster",
                                            abspath, use_latex_path,
                                            support::PROTECT_EXTENSION,
@@ -159,7 +153,7 @@ string const doSubstitution(InsetExternalParams const & params,
        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);
+                       '.' + 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);
@@ -172,12 +166,12 @@ string const doSubstitution(InsetExternalParams const & params,
                string const file = result.substr(pos + 12, end - (pos + 12));
                string contents;
 
-               string const filepath = support::IsFileReadable(file) ?
+               string const filepath = support::isFileReadable(file) ?
                        buffer.filePath() : m_buffer->temppath();
                support::Path p(filepath);
 
-               if (support::IsFileReadable(file))
-                       contents = support::GetFileContents(file);
+               if (support::isFileReadable(file))
+                       contents = support::getFileContents(file);
 
                result = support::subst(result,
                                        ("$$Contents(\"" + file + "\")").c_str(),
@@ -252,7 +246,7 @@ void updateExternal(InsetExternalParams const & params,
        // We copy the source file to the temp dir and do the conversion
        // there if necessary
        string const temp_file =
-               support::MakeAbsPath(params.filename.mangledFilename(),
+               support::makeAbsPath(params.filename.mangledFilename(),
                                     m_buffer->temppath());
        if (!abs_from_file.empty()) {
                unsigned long const from_checksum = support::sum(abs_from_file);
@@ -275,7 +269,7 @@ void updateExternal(InsetExternalParams const & params,
                                              outputFormat.updateResult,
                                              false, true);
        string const abs_to_file =
-               support::MakeAbsPath(to_file, m_buffer->temppath());
+               support::makeAbsPath(to_file, m_buffer->temppath());
 
        // Record the referenced files for the exporter.
        // The exporter will copy them to the export dir.
@@ -286,7 +280,7 @@ void updateExternal(InsetExternalParams const & params,
                vector<string>::const_iterator fit  = rit->second.begin();
                vector<string>::const_iterator fend = rit->second.end();
                for (; fit != fend; ++fit) {
-                       string const source = support::MakeAbsPath(
+                       string const source = support::makeAbsPath(
                                        doSubstitution(params, buffer, *fit,
                                                       false, true),
                                        m_buffer->temppath());
@@ -311,11 +305,13 @@ void updateExternal(InsetExternalParams const & params,
        // Yes if to_file does not exist or if from_file is newer than to_file
        if (support::compare_timestamps(temp_file, abs_to_file) < 0)
                return; // SUCCESS
-       string const to_file_base =
-               support::ChangeExtension(to_file, string());
+
+       // FIXME (Abdel 12/08/06): Is there a need to show these errors?
+       ErrorList el;
        /* bool const success = */
-               converters.convert(&buffer, temp_file, to_file_base,
-                                  from_format, to_format, true);
+               converters.convert(&buffer, temp_file, abs_to_file,
+                                  abs_from_file, from_format, to_format, el,
+                                  Converters::try_default | Converters::try_cache);
        // return success
 }
 
@@ -331,7 +327,7 @@ string const substituteOptions(InsetExternalParams const & params,
 
 int writeExternal(InsetExternalParams const & params,
                  string const & format,
-                 Buffer const & buffer, ostream & os,
+                 Buffer const & buffer, odocstream & os,
                  ExportData & exportdata,
                  bool external_in_tmpdir,
                  bool external_in_comment)
@@ -359,7 +355,8 @@ int writeExternal(InsetExternalParams const & params,
                                    use_latex_path, external_in_tmpdir);
        str = substituteCommands(params, str, format);
        str = substituteOptions(params, str, format);
-       os << str;
+       // FIXME UNICODE
+       os << from_utf8(str);
        return int(lyx::count(str.begin(), str.end(),'\n'));
 }
 
@@ -482,8 +479,6 @@ string const substituteOption(InsetExternalParams const & params,
                return sanitizeLatexOption(opt);
        if (format == "DocBook")
                return sanitizeDocBookOption(opt);
-       if (format == "LinuxDoc")
-               return sanitizeLinuxDocOption(opt);
        return opt;
 }
 
@@ -512,9 +507,10 @@ string const substituteOptions(InsetExternalParams const & params,
        }
 
        return output;
- }
+}
 
 } // namespace anon
 
 } // namespace external
+
 } // namespace lyx