#include "debug.h"
#include "LyX.h" // for use_gui
-#include "LyXLex.h"
+#include "Lexer.h"
#include "LyXRC.h"
#include "graphics/GraphicsParams.h"
#include "support/filetools.h"
#include "support/lyxlib.h"
#include "support/lstrings.h"
-#include "support/translator.h"
+#include "support/Translator.h"
namespace lyx {
lyxscale = 100; // lyx scaling in percentage
display = graphics::DefaultDisplay; // display mode; see preferences
scale = string("100"); // output scaling in percentage
- width = LyXLength();
- height = LyXLength();
+ width = Length();
+ height = Length();
keepAspectRatio = false; // for LaTeX output
draft = false; // draft mode
noUnzip = false; // unzip files
+ scaleBeforeRotation = false; // scale image before rotating
bb = string(); // bounding box
clip = false; // clip image
keepAspectRatio = igp.keepAspectRatio;
draft = igp.draft;
noUnzip = igp.noUnzip;
+ scaleBeforeRotation = igp.scaleBeforeRotation;
bb = igp.bb;
clip = igp.clip;
left.keepAspectRatio == right.keepAspectRatio &&
left.draft == right.draft &&
left.noUnzip == right.noUnzip &&
+ left.scaleBeforeRotation == right.scaleBeforeRotation &&
left.bb == right.bb &&
os << "\tdraft\n";
if (noUnzip)
os << "\tnoUnzip\n";
+ if (scaleBeforeRotation)
+ os << "\tscaleBeforeRotation\n";
if (!bb.empty()) // bounding box
os << "\tBoundingBox " << bb << '\n';
}
-bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const & bufpath)
+bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const & bufpath)
{
if (token == "filename") {
lex.eatLine();
scale = lex.getString();
} else if (token == "width") {
lex.next();
- width = LyXLength(lex.getString());
+ width = Length(lex.getString());
scale = string();
} else if (token == "height") {
lex.next();
- height = LyXLength(lex.getString());
+ height = Length(lex.getString());
scale = string();
} else if (token == "keepAspectRatio") {
keepAspectRatio = true;
draft = true;
} else if (token == "noUnzip") {
noUnzip = true;
+ } else if (token == "scaleBeforeRotation") {
+ scaleBeforeRotation = true;
} else if (token == "BoundingBox") {
bb.erase();
for (int i = 0; i < 4; ++i) {
string const tmp = readBB_from_PSFile(filename);
LYXERR(Debug::GRAPHICS) << "BB_from_File: " << tmp << std::endl;
if (!tmp.empty()) {
-#ifdef WITH_WARNINGS
-# warning why not convert to unsigned int? (Lgb)
-#endif
+ // FIXME: why not convert to unsigned int? (Lgb)
unsigned int const bb_orig_xl = convert<int>(token(tmp, ' ', 0));
unsigned int const bb_orig_yb = convert<int>(token(tmp, ' ', 1));
// new pars.bb values must be >= zero
- if (pars.bb.xl > bb_orig_xl)
+ if (pars.bb.xl > bb_orig_xl)
pars.bb.xl -= bb_orig_xl;
else
pars.bb.xl = 0;