Fix wrongly copy-pasted entries in SpellcheckerUi.ui

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

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 301382b9f5241a3f2587188db9e3a3c510318422..ac76d4e251d1afa5aa4de3d57452cec3fd597c13 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -102,9 +102,10 @@ namespace {
 /// Note that \p format may be unknown (i. e. an empty string)
 string findTargetFormat(string const & format, OutputParams const & runparams)
 {
-       // Are we using latex or XeTeX/pdflatex?
+       // Are we using latex or XeTeX/LuaTeX/pdflatex?
        if (runparams.flavor == OutputParams::PDFLATEX
-           || runparams.flavor == OutputParams::XETEX) {
+           || runparams.flavor == OutputParams::XETEX
+           || runparams.flavor == OutputParams::LUATEX) {
                LYXERR(Debug::GRAPHICS, "findTargetFormat: PDF mode");
                Format const * const f = formats.getFormat(format);
                // Convert vector graphics to pdf
@@ -209,6 +210,7 @@ void InsetGraphics::doDispatch(Cursor & cur, FuncRequest & cmd)
                        break;
                }
 
+               cur.recordUndo();
                setParams(p);
                // if the inset is part of a graphics group, all the
                // other members should be updated too.
@@ -589,17 +591,17 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
                params().filename.outputFileName(masterBuffer->filePath()) :
                onlyFileName(temp_file.absFileName());
 
-       if (runparams.nice ) {
+       if (runparams.nice) {
                if (!isValidLaTeXFileName(output_file)) {
                        frontend::Alert::warning(_("Invalid filename"),
-                                        _("The following filename will cause troubles "
-                                              "when running the exported file through LaTeX: ") +
-                                            from_utf8(output_file));
+                               _("The following filename will cause troubles "
+                                 "when running the exported file through LaTeX: ") +
+                               from_utf8(output_file));
                }
                // only show DVI-specific warning when export format is plain latex
                if (!isValidDVIFileName(output_file)
                        && runparams.flavor == OutputParams::LATEX) {
-                       frontend::Alert::warning(_("Problematic filename for DVI"),
+                               frontend::Alert::warning(_("Problematic filename for DVI"),
                                         _("The following filename can cause troubles "
                                               "when running the exported file through LaTeX "
                                                   "and opening the resulting DVI: ") +
@@ -744,8 +746,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.
@@ -794,8 +796,6 @@ int InsetGraphics::latex(odocstream & os,
        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'));
 }
 
 
@@ -958,6 +958,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?");
@@ -968,10 +969,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();
@@ -1029,7 +1038,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();
 
@@ -1039,7 +1048,7 @@ void InsetGraphics::addToToc(DocIterator const & cpit)
 }
 
 
-docstring InsetGraphics::contextMenu(BufferView const &, int, int) const
+docstring InsetGraphics::contextMenuName() const
 {
        return from_ascii("context-graphics");
 }