* 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.
*/
#include "InsetGraphicsParams.h"
+#include "Buffer.h"
#include "LyX.h" // for use_gui
#include "Lexer.h"
#include "LyXRC.h"
-#include "Buffer.h"
#include "graphics/GraphicsParams.h"
#include "graphics/GraphicsTypes.h"
{
filename.erase();
lyxscale = 100; // lyx scaling in percentage
- display = graphics::DefaultDisplay; // display mode; see preferences
+ display = true; // may be overriden by display mode in preferences
scale = string("100"); // output scaling in percentage
width = Length();
height = Length();
rotateAngle = "0"; // angle of rotation in degrees
rotateOrigin.erase(); // Origin of rotation
special.erase(); // additional userdefined stuff
+ groupId.clear();
}
rotateAngle = igp.rotateAngle;
rotateOrigin = igp.rotateOrigin;
special = igp.special;
+ groupId = igp.groupId;
}
left.rotateAngle == right.rotateAngle &&
left.rotateOrigin == right.rotateOrigin &&
- left.special == right.special;
+ left.special == right.special &&
+ left.groupId == right.groupId;
}
os << "\tfilename " << filename.outputFilename(buffer.filePath()) << '\n';
if (lyxscale != 100)
os << "\tlyxscale " << lyxscale << '\n';
- if (display != graphics::DefaultDisplay)
- os << "\tdisplay " << graphics::displayTranslator().find(display) << '\n';
+ if (!display)
+ os << "\tdisplay false\n";
if (!scale.empty() && !float_equal(convert<double>(scale), 0.0, 0.05)) {
if (!float_equal(convert<double>(scale), 100.0, 0.05))
os << "\tscale " << scale << '\n';
os << "\trotateOrigin " << rotateOrigin << '\n';
if (!special.empty())
os << "\tspecial " << special << '\n';
+ if (!groupId.empty())
+ os << "\tgroupId "<< groupId << '\n';
}
} else if (token == "display") {
lex.next();
string const type = lex.getString();
- display = graphics::displayTranslator().find(type);
+ display = lex.getString() != "false";
} else if (token == "scale") {
lex.next();
scale = lex.getString();
} else if (token == "special") {
lex.eatLine();
special = lex.getString();
+ } else if (token == "groupId") {
+ lex.eatLine();
+ groupId = lex.getString();
// catch and ignore following two old-format tokens and their arguments.
// e.g. "size_kind scale" clashes with the setting of the
}
}
- if (display == graphics::DefaultDisplay) {
- pars.display = graphics::DisplayType(lyxrc.display_graphics);
- } else {
- pars.display = display;
- }
+ pars.display = display;
// Override the above if we're not using a gui
if (!use_gui)
- pars.display = graphics::NoDisplay;
+ pars.display = false;
return pars;
}