X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphics.h;h=2a04f0c33cf469d8070c7f0eb50dfc33a8373462;hb=bfddee97e191a853f0576f4fab3f095c4e9ce0de;hp=7aaff0cf835f75e216d960077eeb474bca902ca1;hpb=80228965b1d6be9dbc8afb10578f71fec671af37;p=lyx.git

diff --git a/src/insets/InsetGraphics.h b/src/insets/InsetGraphics.h
index 7aaff0cf83..2a04f0c33c 100644
--- a/src/insets/InsetGraphics.h
+++ b/src/insets/InsetGraphics.h
@@ -13,10 +13,11 @@
 #ifndef INSET_GRAPHICS_H
 #define INSET_GRAPHICS_H
 
-#include <set>
 #include "Inset.h"
 #include "InsetGraphicsParams.h"
 
+#include <set>
+
 namespace lyx {
 
 class RenderGraphic;
@@ -33,7 +34,7 @@ class InsetGraphics : public Inset
 {
 public:
 	///
-	InsetGraphics(Buffer & buf);
+	InsetGraphics(Buffer * buf);
 	///
 	~InsetGraphics();
 
@@ -51,6 +52,8 @@ public:
 	bool setParams(InsetGraphicsParams const & params);
 
 	InsetGraphicsParams getParams() const { return params_;}
+	///
+	bool clickable(int, int) const { return true; }
 
 private:
 	///
@@ -60,7 +63,7 @@ private:
 	bool isLabeled() const { return true; }
 	void metrics(MetricsInfo &, Dimension &) const;
 	///
-	EDITABLE editable() const;
+	bool hasSettings() const { return true; }
 	///
 	void write(std::ostream &) const;
 	///
@@ -69,11 +72,13 @@ private:
 	 #fragile == true# means, that the inset should take care about
 	 fragile commands by adding a #\protect# before.
 	 */
-	int latex(odocstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const;
 	///
 	int plaintext(odocstream &, OutputParams const &) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
+	///
+	docstring xhtml(XHTMLStream & os, OutputParams const &) const;
 	/** Tell LyX what the latex features you need i.e. what latex packages
 	    you need to be included.
 	 */
@@ -87,14 +92,14 @@ private:
 	///
 	bool showInsetDialog(BufferView * bv) const;
 	///
-	void editGraphics(InsetGraphicsParams const &, Buffer const &) const;
+	void editGraphics(InsetGraphicsParams const &) const;
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
-	void addToToc(DocIterator const &);
+	void addToToc(DocIterator const &) const;
 	///
-	docstring contextMenu(BufferView const & bv, int x, int y) const;
-	/// Force inset into LTR environment if surroundings are RTL?
+	docstring contextMenuName() const;
+	/// Force inset into LTR environment if surroundings are RTL
 	bool forceLTR() const { return true; }
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
@@ -109,7 +114,13 @@ private:
 	/// Create the atributes for docbook export.
 	docstring createDocBookAttributes() const;
 	/// Convert the file if needed, and return the location of the file.
+	/// This version is for use with LaTeX-style output.
 	std::string prepareFile(OutputParams const &) const;
+	/// Convert the file if needed, and return the location of the file.
+	/// This version is for use with HTML-style output.
+	/// \return the new filename, relative to the location of the HTML file,
+	/// or an empty string on error.
+	std::string prepareHTMLFile(OutputParams const & runparams) const;
 
 	///
 	InsetGraphicsParams params_;