Output width and height parameters for XHTML images. Thanks to Rob Oakes

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

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 31b6c181f314ed416e92c72d3c671d406f898444..f76666fb05cc4ce555c24de07da9da1831c21b8f 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.
@@ -744,7 +746,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
 }
 
 
-int InsetGraphics::latex(odocstream & os,
+int InsetGraphics::latex(otexstream & os,
                         OutputParams const & runparams) const
 {
        // If there is no file specified or not existing,
@@ -958,6 +960,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 +971,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 +1040,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 +1050,7 @@ void InsetGraphics::addToToc(DocIterator const & cpit)
 }
 
 
-docstring InsetGraphics::contextMenu(BufferView const &, int, int) const
+docstring InsetGraphics::contextMenuName() const
 {
        return from_ascii("context-graphics");
 }