X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphicsParams.h;h=315f4c70827bd34b0890d4473122aeaff84ecf1f;hb=e5c79a43ee78192f45a9ab34873f8bb426b5f37e;hp=05c65da5c6fc0e7181abfda9d6d34c053d259d0b;hpb=39e79d8602920eefe36e898c9f415afb979521b2;p=lyx.git

diff --git a/src/insets/InsetGraphicsParams.h b/src/insets/InsetGraphicsParams.h
index 05c65da5c6..315f4c7082 100644
--- a/src/insets/InsetGraphicsParams.h
+++ b/src/insets/InsetGraphicsParams.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voß
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,15 +14,18 @@
 #define INSETGRAPHICSPARAMS_H
 
 
-#include "graphics/GraphicsTypes.h"
-#include "LyXLength.h"
+#include "graphics/GraphicsParams.h"
+
 #include "support/FileName.h"
 
+#include <string>
+
 namespace lyx {
 
 namespace graphics { class Params; }
 
 class Lexer;
+class Buffer;
 
 
 /// This class holds all the parameters needed by insetGraphics.
@@ -33,23 +36,23 @@ public:
 	support::DocFileName filename;
 	/// Scaling the Screen inside Lyx
 	unsigned int lyxscale;
-	/// How to display the image inside LyX
-	graphics::DisplayType display;
+	/// If to display the image inside LyX
+	bool display;
 	/// Scaling for output (LaTeX)
 	std::string scale;
 	/// sizes for output (LaTeX)
-	LyXLength width;
+	Length width;
 	///
-	LyXLength height;
+	Length height;
 	/// Keep the ratio between height and width when resizing.
 	bool keepAspectRatio;
 	/// draft mode
 	bool draft;
-	/// what to do with zipped files
-	bool noUnzip;
+	/// scale image before rotating
+	bool scaleBeforeRotation;
 
-	/// The bounding box with "xLB yLB yRT yRT ", divided by a space!
-	std::string bb;
+	/// The bounding box
+	graphics::BoundingBox bbox;
 	/// clip image
 	bool clip;
 
@@ -57,10 +60,6 @@ public:
 	std::string rotateAngle;
 	/// Origin point of rotation
 	std::string rotateOrigin;
-	/// Do we have a subcaption?
-	bool subcaption;
-	/// The text of the subcaption.
-	std::string subcaptionText;
 	/// any userdefined special command
 	std::string special;
 
@@ -71,15 +70,20 @@ public:
 	///
 	InsetGraphicsParams & operator=(InsetGraphicsParams const &);
 	/// Save the parameters in the LyX format stream.
-	void Write(std::ostream & os, std::string const & bufpath) const;
+	/// Buffer is needed to figure out if a figure is embedded.
+	void Write(std::ostream & os, Buffer const & buf) const;
 	/// If the token belongs to our parameters, read it.
-	bool Read(Lexer & lex, std::string const & token, std::string const & bufpath);
+	bool Read(Lexer & lex, std::string const & token, Buffer const & buf,
+	          bool allowOrigin);
 	/// convert
-  // Only a subset of InsetGraphicsParams is needed for display purposes.
-  // This function also interrogates lyxrc to ascertain whether
-  // to display or not.
+	// Only a subset of InsetGraphicsParams is needed for display purposes.
+	// This function also interrogates lyxrc to ascertain whether
+	// to display or not.
 	graphics::Params as_grfxParams() const;
 
+	// FIXME UNICODE. Write functions need to use odostream instead of ostream firstly.
+	/// Identification of the graphics template. No template equals empty string.
+	std::string groupId;
 private:
 	/// Initialize the object to a default status.
 	void init();