* InsetTabular.cpp: fix logic of multirow top/bottom line output (bug #7578)

[lyx.git] / src / insets / InsetGraphics.cpp

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 3bbf19f3b1810385710bc56ef07c28230258056f..48155fc109a97366d585e32d26d295408243ed15 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -490,7 +490,7 @@ copyToDirIfNeeded(DocFileName const & file, string const & dir)
                return make_pair(IDENTICAL_PATHS, file_in);
 
        string mangled = file.mangledFileName();
-       if (file.isZipped()) {
+       if (formats.isZippedFile(file)) {
                // We need to change _eps.gz to .eps.gz. The mangled name is
                // still unique because of the counter in mangledFileName().
                // We can't just call mangledFileName() with the zip
@@ -611,13 +611,12 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
 
        FileName source_file = runparams.nice ? FileName(params().filename) : temp_file;
        // determine the export format
-       string const tex_format = (runparams.flavor == OutputParams::LATEX) ?
-                       "latex" : "pdflatex";
+       string const tex_format = flavor2format(runparams.flavor);
 
        // If the file is compressed and we have specified that it
        // should not be uncompressed, then just return its name and
        // let LaTeX do the rest!
-       if (params().filename.isZipped()) {
+       if (formats.isZippedFile(params().filename)) {
                if (params().noUnzip) {
                        // We don't know whether latex can actually handle
                        // this file, but we can't check, because that would
@@ -746,8 +745,8 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
 }
 
 
-int InsetGraphics::latex(odocstream & os,
-                        OutputParams const & runparams) const
+void InsetGraphics::latex(otexstream & os,
+                         OutputParams const & runparams) const
 {
        // If there is no file specified or not existing,
        // just output a message about it in the latex output.
@@ -790,14 +789,19 @@ int InsetGraphics::latex(odocstream & os,
        // Convert the file if necessary.
        // Remove the extension so LaTeX will use whatever is appropriate
        // (when there are several versions in different formats)
-       latex_str += prepareFile(runparams);
+       string file_path = prepareFile(runparams);
+       if (!runparams.export_folder.empty()) {
+               // Relative pathnames starting with ../ will be sanitized
+               // if exporting to a different folder
+               while (file_path.substr(0, 17) == "\\lyxdot \\lyxdot /")
+                       file_path = file_path.substr(17, file_path.length() - 17);
+       }
+       latex_str += file_path;
        latex_str += '}' + after;
        // FIXME UNICODE
        os << from_utf8(latex_str);
 
        LYXERR(Debug::GRAPHICS, "InsetGraphics::latex outputting:\n" << latex_str);
-       // Return how many newlines we issued.
-       return int(count(latex_str.begin(), latex_str.end(),'\n'));
 }
 
 
@@ -960,6 +964,7 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const
 docstring InsetGraphics::xhtml(XHTMLStream & xs, OutputParams const & op) const
 {
        string const output_file = prepareHTMLFile(op);
+
        if (output_file.empty()) {
                LYXERR0("InsetGraphics::xhtml: Unable to prepare file `" 
                        << params().filename << "' for output. File missing?");
@@ -970,10 +975,18 @@ docstring InsetGraphics::xhtml(XHTMLStream & xs, OutputParams const & op) const
        }
 
        // FIXME XHTML 
-       // Do we want to do something with the parameters, other than use them to 
-       // crop, etc, the image?
-       // Speaking of which: Do the cropping, rotating, etc.
-       string const attr = "src='" + output_file + "' alt='image: " 
+       // We aren't doing anything with the crop and rotate parameters, and it would
+       // really be better to do width and height conversion, rather than to output
+       // these parameters here.
+       string imgstyle;
+       if (!params().width.zero())
+               imgstyle += "width:" + params().width.asHTMLString() + ";";
+       if (!params().height.zero())
+               imgstyle += " height:" + params().height.asHTMLString() + ";";
+       if (!imgstyle.empty())
+               imgstyle = "style='" + imgstyle + "' ";
+
+       string const attr = imgstyle + "src='" + output_file + "' alt='image: " 
                            + output_file + "'";
        xs << html::CompTag("img", attr);
        return docstring();
@@ -1031,7 +1044,7 @@ void InsetGraphics::editGraphics(InsetGraphicsParams const & p) const
 }
 
 
-void InsetGraphics::addToToc(DocIterator const & cpit)
+void InsetGraphics::addToToc(DocIterator const & cpit) const
 {
        TocBackend & backend = buffer().tocBackend();