#endif
#include "insetgraphicsParams.h"
+
#include "support/translator.h"
#include "support/filetools.h"
#include "support/lyxlib.h"
#include "support/LOstream.h"
#include "support/LAssert.h"
+
+using std::ostream;
+
+
namespace {
/// This variable keeps a tab on whether the translator was set with the
bb = string(); // bounding box
draft = false; // draft mode
clip = false; // clip image
- display = DEFAULT;
+ display = DEFAULT; // see pref
subcaption = false; // subfigure
+ noUnzip = false; // unzip files
width = LyXLength(); // set to 0pt
height = LyXLength();
lyxwidth = LyXLength(); // for the view in lyx
- lyxheight = LyXLength();
- scale = 0;
+ lyxheight = LyXLength(); // also set to 0pt
+ scale = 0; // unit is %
+ lyxscale = 0; // same for lyxview
size_type = DEFAULT_SIZE; // do nothing
- keepAspectRatio = false; //
- rotateOrigin = "center"; //
+ lyxsize_type = DEFAULT_SIZE; // do nothing
+ keepAspectRatio = false; // only for latex
+ rotate = false; // Rotating
+ rotateOrigin = "center"; // Origin
rotateAngle = 0.0; // in degrees
special = string(); // userdefined stuff
}
display = igp.display;
subcaption = igp.subcaption;
subcaptionText = igp.subcaptionText;
+ noUnzip = igp.noUnzip;
keepAspectRatio = igp.keepAspectRatio;
width = igp.width;
height = igp.height;
scale = igp.scale;
size_type = igp.size_type;
+ lyxsize_type = igp.lyxsize_type;
lyxwidth = igp.lyxwidth;
lyxheight = igp.lyxheight;
+ lyxscale = igp.lyxscale;
+ rotate = igp.rotate;
rotateOrigin = igp.rotateOrigin;
rotateAngle = igp.rotateAngle;
special = igp.special;
left.clip == right.clip &&
left.display == right.display &&
left.subcaption == right.subcaption &&
+ left.noUnzip == right.noUnzip &&
left.subcaptionText == right.subcaptionText &&
left.keepAspectRatio == right.keepAspectRatio &&
left.width == right.width &&
left.height == right.height &&
left.scale == right.scale &&
left.size_type == right.size_type &&
+ left.lyxsize_type == right.lyxsize_type &&
left.lyxwidth == right.lyxwidth &&
left.lyxheight == right.lyxheight &&
+ left.lyxscale == right.lyxscale &&
+ left.rotate == right.rotate &&
left.rotateOrigin == right.rotateOrigin &&
lyx::float_equal(left.rotateAngle, right.rotateAngle, 0.001 &&
left.special == right.special)
- )
+ )
return true;
return false;
os << "\tclip\n";
if (draft) // draft mode
os << "\tdraft\n";
- // Save the display type
+ // Save the display type for the view inside lyx
os << "\tdisplay " << displayTranslator.find(display) << '\n';
// Save the subcaption status
if (subcaption)
os << "\tsubcaption\n";
if (!subcaptionText.empty())
os << "\tsubcaptionText \"" << subcaptionText << '\"' << '\n';
+ if (noUnzip)
+ os << "\tnoUnzip\n";
// we always need the size type
// 0: no special
// 1: width/height combination
os << "\tscale " << scale << '\n';
if (keepAspectRatio)
os << "\tkeepAspectRatio\n";
+ if (rotate)
+ os << "\trotate\n";
if (!lyx::float_equal(rotateAngle, 0.0, 0.001))
os << "\trotateAngle " << rotateAngle << '\n';
if (!rotateOrigin.empty())
os << "\trotateOrigin " << rotateOrigin << '\n';
if (!special.empty())
os << "\tspecial " << special << '\n';
+ // the values for the view in lyx
+ os << "\tlyxsize_type " << lyxsize_type << '\n';
if (!lyxwidth.zero()) // the lyx-viewsize
os << "\tlyxwidth " << lyxwidth.asString() << '\n';
if (!lyxheight.zero())
os << "\tlyxheight " << lyxheight.asString();
+ if (lyxscale != 0)
+ os << "\tlyxscale " << lyxscale << '\n';
}
} else if (token == "subcaptionText") {
lex.next();
subcaptionText = lex.getString();
- } else if (token == "widthResize") {
- if (lex.next()) {
- string const token = lex.getString();
- if (token == "scale") {
- lex.next();
- scale = lex.getInteger();
- size_type = SCALE;
- }
- else {
- width = convertResizeValue(token, lex);
- size_type = WH;
- }
- }
+ } else if (token == "noUnzip") {
+ noUnzip = true;
} else if (token == "size_type") {
lex.next();
switch (lex.getInteger()) {
lex.next();
width = LyXLength(lex.getString());
size_type = WH;
- } else if (token == "heightResize") {
- if (lex.next())
- height = convertResizeValue(lex.getString(), lex);
} else if (token == "height") {
lex.next();
height = LyXLength(lex.getString());
} else if (token == "scale") {
lex.next();
scale = lex.getInteger();
+ } else if (token == "rotate") {
+ rotate = true;
} else if (token == "rotateAngle") {
lex.next();
rotateAngle = lex.getFloat();
} else if (token == "rotateOrigin") {
lex.next();
rotateOrigin=lex.getString();
+ } else if (token == "lyxsize_type") {
+ lex.next();
+ switch (lex.getInteger()) {
+ case 0 : lyxsize_type = DEFAULT_SIZE;
+ break;
+ case 1 : lyxsize_type = WH;
+ break;
+ case 2 : lyxsize_type = SCALE;
+ }
} else if (token == "lyxwidth") {
lex.next();
lyxwidth = LyXLength(lex.getString());
} else if (token == "lyxheight") {
lex.next();
lyxheight = LyXLength(lex.getString());
- } else {
- // If it's none of the above, its not ours.
+ } else if (token == "lyxscale") {
+ lex.next();
+ lyxscale = lex.getInteger();
+ // now the compytibility stuff for "old" 1.2.0 files which uses
+ // the first try of the new graphic inset. Can be deleted, when
+ // 1.3 comes out
+ } else if (token == "widthResize") {
+ if (lex.next()) {
+ string const token = lex.getString();
+ if (token == "scale") {
+ lex.next();
+ scale = lex.getInteger();
+ size_type = SCALE;
+ }
+ else {
+ width = convertResizeValue(token, lex);
+ size_type = WH;
+ }
+ }
+ } else if (token == "heightResize") {
+ if (lex.next())
+ height = convertResizeValue(lex.getString(), lex);
+ // end compytibility stuff
+ } else { // If it's none of the above, its not ours.
return false;
}
return true;
projects / lyx.git / blobdiff