X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FinsetgraphicsParams.h;h=601df89b0a740839133208d0701a4e5ace6725d0;hb=b922cdd796f9e4b9a46a79808cdee596e04903eb;hp=027b385ae4121ad176a34a5e7786a55d20bab11c;hpb=f4bad86bdaf333294ad1309b20e3df113fc70c3a;p=lyx.git

diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h
index 027b385ae4..601df89b0a 100644
--- a/src/insets/insetgraphicsParams.h
+++ b/src/insets/insetgraphicsParams.h
@@ -4,7 +4,7 @@
  * 
  *          LyX, The Document Processor
  *          Copyright 1995 Matthias Ettrich.
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  *          This file Copyright 2000 Baruch Even
  * ================================================= */
@@ -14,9 +14,8 @@
 
 #ifdef __GNUG__
 #pragma interface
-#endif
+#endif 
 
-#include <config.h>
 #include "LString.h"
 
 #include "buffer.h"
@@ -25,102 +24,105 @@
 using std::ostream;
 
 /// This struct holds all the parameters needed by insetGraphics.
-struct InsetGraphicsParams {
-    /// Image filename.
-    string filename;
-    
-    /// How do we display the image?
-    enum DisplayType {
-        /// In full color range (if it's not in color we show it as it is)
-        COLOR,
-        /// In Grayscale (256 shades of gray).
-        GRAYSCALE,
-        /// In black and white.
-        MONOCHROME,
-        /// Don't display it on screen, only keep a frame in place.
-        NONE
-    };
-
-    /// How to display the image
-    DisplayType display;
-
-    /// Is the figure inlined? (not in a paragraph of its own).
-    bool inlineFigure;
-
-    /// Do we have a subcaption?
-    bool subcaption;
-
-    /// The text of the subcaption.
-    string subcaptionText;
-    
+struct InsetGraphicsParams
+{
+	/// Image filename.
+	string filename;
+
+	/// How do we display the image?
+	enum DisplayType {
+	    /// In full color range (if it's not in color we show it as it is)
+	    COLOR,
+	    /// In Grayscale (256 shades of gray).
+	    GRAYSCALE,
+	    /// In black and white.
+	    MONOCHROME,
+	    /// Don't display it on screen, only keep a frame in place.
+	    NONE
+	};
+
+	/// How to display the image
+	DisplayType display;
+
+	/// Do we have a subcaption?
+	bool subcaption;
+
+	/// The text of the subcaption.
+	string subcaptionText;
+
 	/// This is the different origins that the graphicx package support.
 	enum Origin {
-		DEFAULT,
-		LEFTTOP,
-		LEFTCENTER,
-		LEFTBASELINE,
-		LEFTBOTTOM,
-		CENTERTOP,
-		CENTER,
-		CENTERBASELINE,
-		CENTERBOTTOM,
-		RIGHTTOP,
-		RIGHTCENTER,
-		RIGHTBASELINE,
-		RIGHTBOTTOM,
-		REFERENCE_POINT = LEFTBASELINE
+	    DEFAULT,
+	    LEFTTOP,
+	    LEFTCENTER,
+	    LEFTBASELINE,
+	    LEFTBOTTOM,
+	    CENTERTOP,
+	    CENTER,
+	    CENTERBASELINE,
+	    CENTERBOTTOM,
+	    RIGHTTOP,
+	    RIGHTCENTER,
+	    RIGHTBASELINE,
+	    RIGHTBOTTOM,
+	    REFERENCE_POINT = LEFTBASELINE
+	};
+
+	/** The resize of the image, is it the default size, in cm, inch or
+	    percentage of the page/column width/height */
+	enum Resize {
+	    DEFAULT_SIZE,
+	    CM,
+	    INCH,
+	    PERCENT_PAGE,
+	    PERCENT_COLUMN,
+		SCALE
 	};
 
-    /// The resize of the image, is it the default size, in cm, inch or
-    /// percentage of the page/column width/height
-    enum Resize {
-        DEFAULT_SIZE,
-        CM,
-        INCH,
-        PERCENT_PAGE,
-        PERCENT_COLUMN
-    };
-
-    
-    /// Keep the ratio between height and width when resizing.
-    bool keepAspectRatio;
-
-    // What width resize to do?
-    Resize widthResize;
-    // Value of width resize
-    float widthSize;
-    // What height resize to do?
-    Resize heightResize;
-    // Value of height resize
-    float heightSize;
-
-    // Origin point of rotation
-    Origin rotateOrigin;
-    // Rotation angle.
-    int rotateAngle;
-
-    InsetGraphicsParams();
-
-    InsetGraphicsParams(InsetGraphicsParams const &);
-    InsetGraphicsParams const & operator=(InsetGraphicsParams const &);
-
-    /// Save the parameters in the LyX format stream.
-    void Write(Buffer const * buf, ostream & os) const;
-    
-    /// If the token belongs to our parameters, read it.
-    bool Read(Buffer const * buf, LyXLex & lex, string const & token);
-    
-    /// Test the struct to make sure that all the options have legal values.
-    void testInvariant() const;
+
+	/// Keep the ratio between height and width when resizing.
+	bool keepAspectRatio;
+
+	/// What width resize to do?
+	Resize widthResize;
+	/// Value of width resize
+	float widthSize;
+	/// What height resize to do?
+	Resize heightResize;
+	/// Value of height resize
+	float heightSize;
+
+	/// Origin point of rotation
+	Origin rotateOrigin;
+	/// Rotation angle.
+	float rotateAngle;
+	///
+	InsetGraphicsParams();
+	///
+	InsetGraphicsParams(InsetGraphicsParams const &);
+	///
+	InsetGraphicsParams & operator=(InsetGraphicsParams const &);
+
+	/// Save the parameters in the LyX format stream.
+	void Write(Buffer const * buf, ostream & os) const;
+
+	/// If the token belongs to our parameters, read it.
+	bool Read(Buffer const * buf, LyXLex & lex, string const & token);
+
+	/// Test the struct to make sure that all the options have legal values.
+	void testInvariant() const;
 
 private:
-    /// Initialize the object to a default status.
-    void init();
+	/// Initialize the object to a default status.
+	void init();
 
-    /// Copy the other objects content to us, used in copy c-tor and assignment
-    void copy(InsetGraphicsParams const & params);
+	/// Copy the other objects content to us, used in copy c-tor and assignment
+	void copy(InsetGraphicsParams const & params);
 };
 
-bool operator==(InsetGraphicsParams const&, InsetGraphicsParams const &);
+///
+bool operator==(InsetGraphicsParams const &, InsetGraphicsParams const &);
+///
+bool operator!=(InsetGraphicsParams const &, InsetGraphicsParams const &);
 
-#endif
+#endif