(Herbert): strip the extension from the graphics filename when exporting

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

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 609e6773e0d42a8e262ad6a0f70346279349fe7d..e6e352ec7ea5be784f9b5485c30d5d4fbff7ca7a 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -474,19 +474,19 @@ void InsetGraphics::readFigInset(LyXLex & lex)
                } else if (token == "subcaption") {
                        if (lex.eatLine())
                                params_.subcaptionText = lex.getString();
-                       params_.subcaption = true;
                } else if (token == "label") {
                        if (lex.next());
                        // kept for backwards compability. Delete in 0.13.x
                } else if (token == "angle") {
-                       if (lex.next())
+                       if (lex.next()) {
                                params_.rotate = true;
                                params_.rotateAngle = lex.getFloat();
+                       }
                } else if (token == "size") {
                        if (lex.next())
                                params_.lyxwidth = LyXLength(lex.getString()+"pt");
                        if (lex.next())
-                               params_.lyxheight = LyXLength(lex.getString()+"pt");    
+                               params_.lyxheight = LyXLength(lex.getString()+"pt");
                        params_.lyxsize_type = InsetGraphicsParams::WH;
                } else if (token == "flags") {
                        if (lex.next())
@@ -614,11 +614,14 @@ string const InsetGraphics::prepareFile(Buffer const *buf) const
        string filename_  = params().filename;
        bool const zipped = zippedFile(filename_);
 
-       if ((zipped && params().noUnzip) || buf->niceFile) {
+       if (zipped && params().noUnzip) {
                lyxerr[Debug::GRAPHICS] << "don't unzip file or export latex"
                                    << filename_ << endl;
                return filename_;
        }
+       // only export latex without compiling the file
+       if (buf->niceFile)
+               return RemoveExtension(filename_);
 
        // Enable these helper functions to find the file if it is stored as
        // a relative path.
@@ -635,7 +638,7 @@ string const InsetGraphics::prepareFile(Buffer const *buf) const
                return filename_;
        }
 
-       string const temp = AddName(buf->tmppath, filename_);
+       string const temp = MakeAbsPath(filename_, buf->tmppath);
        string const outfile_base = RemoveExtension(temp);
 
        lyxerr[Debug::GRAPHICS] << "tempname = " << temp << "\n";
@@ -644,23 +647,23 @@ string const InsetGraphics::prepareFile(Buffer const *buf) const
        lyxerr[Debug::GRAPHICS] << "outfile_base = " << outfile_base << endl;
 
        converters.convert(buf, filename_, outfile_base, from, to);
-       return outfile_base;
+       return RemoveExtension(filename_);
 }
 
 
 int InsetGraphics::latex(Buffer const *buf, ostream & os,
                         bool /*fragile*/, bool/*fs*/) const
 {
-       // If there is no file specified or not existing, 
+       // If there is no file specified or not existing,
        // just output a message about it in the latex output.
-       lyxerr[Debug::GRAPHICS] << "[latex]filename = " 
-                               << params().filename << endl;               
-       string const message = 
-           (IsFileReadable(MakeAbsPath(params().filename, buf->filePath())) 
+       lyxerr[Debug::GRAPHICS] << "[latex]filename = "
+                               << params().filename << endl;
+       string const message =
+           (IsFileReadable(MakeAbsPath(params().filename, buf->filePath()))
                && !params().filename.empty()) ?
                    string() :
                    string("bb = 0 0 200 100, draft, type=eps]");
-       lyxerr[Debug::GRAPHICS] << "[latex]Messagestring = " << message << endl;                    
+       lyxerr[Debug::GRAPHICS] << "[latex]Messagestring = " << message << endl;
 
        // These variables collect all the latex code that should be before and
        // after the actual includegraphics command.
@@ -676,20 +679,20 @@ int InsetGraphics::latex(Buffer const *buf, ostream & os,
 
        // Write the options if there are any.
        string const opts = createLatexOptions();
-       lyxerr[Debug::GRAPHICS] << "[latex]opts = " << opts << endl;                
+       lyxerr[Debug::GRAPHICS] << "[latex]opts = " << opts << endl;
        if (!opts.empty() && !message.empty())
                before += ("[" + opts + ',' + message);
        else if (!message.empty())
                before += ('[' + message);
        else if (!opts.empty())
                before += ("[" + opts + ']');
-       lyxerr[Debug::GRAPHICS] << "[latex]before = " << before << endl;                    
-       lyxerr[Debug::GRAPHICS] << "[latex]after = " << after << endl;              
+       lyxerr[Debug::GRAPHICS] << "[latex]before = " << before << endl;
+       lyxerr[Debug::GRAPHICS] << "[latex]after = " << after << endl;
 
        // Make the filename relative to the lyx file
        // and remove the extension so the LaTeX will use whatever is
        // appropriate (when there are several versions in different formats)
-       string const latex_str = message.empty() ? 
+       string const latex_str = message.empty() ?
                (before + '{' + prepareFile(buf) + '}' + after) :
                (before + '{' + params().filename + " not found!}" + after);
        os << latex_str;