* 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 "debug.h"
+#include "Buffer.h"
#include "LyX.h" // for use_gui
-#include "LyXLex.h"
+#include "Lexer.h"
#include "LyXRC.h"
-#include "graphics/GraphicsParams.h"
+#include "graphics/epstools.h"
+#include "graphics/GraphicsTypes.h"
#include "support/convert.h"
-#include "support/filetools.h"
+#include "support/debug.h"
#include "support/lyxlib.h"
#include "support/lstrings.h"
-#include "support/translator.h"
+#include "support/Translator.h"
+#include <ostream>
-namespace lyx {
-
-using support::float_equal;
-using support::readBB_from_PSFile;
-using support::token;
+using namespace std;
+using namespace lyx::support;
-using std::string;
-using std::ostream;
+namespace lyx {
InsetGraphicsParams::InsetGraphicsParams()
}
-InsetGraphicsParams &
-InsetGraphicsParams::operator=(InsetGraphicsParams const & params)
+InsetGraphicsParams & InsetGraphicsParams::operator=(InsetGraphicsParams const & params)
{
// Are we assigning the object into itself?
if (this == ¶ms)
{
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 = 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
+ bbox = graphics::BoundingBox(); // bounding box
clip = false; // clip image
rotateAngle = "0"; // angle of rotation in degrees
rotateOrigin.erase(); // Origin of rotation
- subcaption = false; // subfigure
- subcaptionText.erase(); // subfigure caption
special.erase(); // additional userdefined stuff
+ groupId.clear();
}
height = igp.height;
keepAspectRatio = igp.keepAspectRatio;
draft = igp.draft;
- noUnzip = igp.noUnzip;
+ scaleBeforeRotation = igp.scaleBeforeRotation;
- bb = igp.bb;
+ bbox = igp.bbox;
clip = igp.clip;
rotateAngle = igp.rotateAngle;
rotateOrigin = igp.rotateOrigin;
- subcaption = igp.subcaption;
- subcaptionText = igp.subcaptionText;
special = igp.special;
+ groupId = igp.groupId;
}
bool operator==(InsetGraphicsParams const & left,
InsetGraphicsParams const & right)
{
- if (left.filename == right.filename &&
+ return left.filename == right.filename &&
left.lyxscale == right.lyxscale &&
left.display == right.display &&
left.scale == right.scale &&
left.height == right.height &&
left.keepAspectRatio == right.keepAspectRatio &&
left.draft == right.draft &&
- left.noUnzip == right.noUnzip &&
+ left.scaleBeforeRotation == right.scaleBeforeRotation &&
-
- left.bb == right.bb &&
+ left.bbox == right.bbox &&
left.clip == right.clip &&
left.rotateAngle == right.rotateAngle &&
left.rotateOrigin == right.rotateOrigin &&
- left.subcaption == right.subcaption &&
- left.subcaptionText == right.subcaptionText &&
- left.special == right.special
- )
- return true;
-
- return false;
+ left.special == right.special &&
+ left.groupId == right.groupId;
}
}
-void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const
+void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const
{
// Do not write the default values
-
- if (!filename.empty()) {
- os << "\tfilename " << filename.outputFilename(bufpath) << '\n';
- }
+ if (!filename.empty())
+ 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 << "\tkeepAspectRatio\n";
if (draft) // draft mode
os << "\tdraft\n";
- if (noUnzip)
- os << "\tnoUnzip\n";
+ if (scaleBeforeRotation)
+ os << "\tscaleBeforeRotation\n";
- if (!bb.empty()) // bounding box
- os << "\tBoundingBox " << bb << '\n';
+ if (!bbox.empty()) // bounding box
+ os << "\tBoundingBox " << bbox << '\n';
if (clip) // clip image
os << "\tclip\n";
os << "\trotateAngle " << rotateAngle << '\n';
if (!rotateOrigin.empty())
os << "\trotateOrigin " << rotateOrigin << '\n';
- if (subcaption)
- os << "\tsubcaption\n";
- if (!subcaptionText.empty())
- os << "\tsubcaptionText \"" << subcaptionText << '\"' << '\n';
if (!special.empty())
os << "\tspecial " << special << '\n';
+ if (!groupId.empty())
+ os << "\tgroupId "<< groupId << '\n';
}
-bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const & bufpath)
+bool InsetGraphicsParams::Read(Lexer & lex, string const & token,
+ Buffer const & buf, bool allowOrigin)
{
if (token == "filename") {
lex.eatLine();
- filename.set(lex.getString(), bufpath);
+ if (allowOrigin)
+ filename = buf.getReferencedFileName(lex.getString());
+ else
+ filename.set(lex.getString(), buf.filePath());
} else if (token == "lyxscale") {
lex.next();
lyxscale = lex.getInteger();
} 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 == "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;
} else if (token == "draft") {
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) {
- if (i != 0)
- bb += ' ';
- lex.next();
- bb += lex.getString();
- }
+ lex.next();
+ bbox.xl = Length(lex.getString());
+ lex.next();
+ bbox.yb = Length(lex.getString());
+ lex.next();
+ bbox.xr = Length(lex.getString());
+ lex.next();
+ bbox.yt = Length(lex.getString());
} else if (token == "clip") {
clip = true;
} else if (token == "rotateAngle") {
} else if (token == "rotateOrigin") {
lex.next();
rotateOrigin=lex.getString();
- } else if (token == "subcaption") {
- subcaption = true;
- } else if (token == "subcaptionText") {
- lex.eatLine();
- string sub = lex.getString();
- // strip surrounding " "
- subcaptionText = sub.substr(1, sub.length() - 2);
} 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
pars.angle = convert<double>(rotateAngle);
if (clip) {
- pars.bb = bb;
+ pars.bb = bbox;
// Get the original Bounding Box from the file
- string const tmp = readBB_from_PSFile(filename);
- LYXERR(Debug::GRAPHICS) << "BB_from_File: " << tmp << std::endl;
+ string const tmp = graphics::readBB_from_PSFile(filename);
+ LYXERR(Debug::GRAPHICS, "BB_from_File: " << tmp);
if (!tmp.empty()) {
-#ifdef WITH_WARNINGS
-# warning why not convert to unsigned int? (Lgb)
-#endif
- unsigned int const bb_orig_xl = convert<int>(token(tmp, ' ', 0));
- unsigned int const bb_orig_yb = convert<int>(token(tmp, ' ', 1));
+ unsigned int const bb_orig_xl = convert<unsigned int>(token(tmp, ' ', 0));
+ unsigned int const bb_orig_yb = convert<unsigned int>(token(tmp, ' ', 1));
// new pars.bb values must be >= zero
- if (pars.bb.xl > bb_orig_xl)
- pars.bb.xl -= bb_orig_xl;
+ if (pars.bb.xl.inBP() > static_cast<int>(bb_orig_xl))
+ pars.bb.xl = Length(pars.bb.xl.inBP() - bb_orig_xl, Length::BP);
else
- pars.bb.xl = 0;
+ pars.bb.xl = Length();
- if (pars.bb.xr > bb_orig_xl)
- pars.bb.xr -= bb_orig_xl;
+ if (pars.bb.xr.inBP() > static_cast<int>(bb_orig_xl))
+ pars.bb.xr = Length(pars.bb.xr.inBP() - bb_orig_xl, Length::BP);
else
- pars.bb.xr = 0;
+ pars.bb.xr = Length();
- if (pars.bb.yb > bb_orig_yb)
- pars.bb.yb -= bb_orig_yb;
+ if (pars.bb.yb.inBP() > static_cast<int>(bb_orig_yb))
+ pars.bb.yb = Length(pars.bb.yb.inBP() - bb_orig_yb, Length::BP);
else
- pars.bb.yb = 0;
+ pars.bb.yb = Length();
- if (pars.bb.yt > bb_orig_yb)
- pars.bb.yt -= bb_orig_yb;
+ if (pars.bb.yt.inBP() > static_cast<int>(bb_orig_yb))
+ pars.bb.yt = Length(pars.bb.yt.inBP() - bb_orig_yb, Length::BP);
else
- pars.bb.yt = 0;
+ pars.bb.yt = Length();
}
// Paranoia check.
- int const width = pars.bb.xr - pars.bb.xl;
- int const height = pars.bb.yt - pars.bb.yb;
+ int const width = pars.bb.xr.inBP() - pars.bb.xl.inBP();
+ int const height = pars.bb.yt.inBP() - pars.bb.yb.inBP();
if (width < 0 || height < 0) {
- pars.bb.xl = 0;
- pars.bb.xr = 0;
- pars.bb.yb = 0;
- pars.bb.yt = 0;
+ pars.bb.xl = Length();
+ pars.bb.xr = Length();
+ pars.bb.yb = Length();
+ pars.bb.yt = Length();
}
}
- if (display == graphics::DefaultDisplay) {
- pars.display = 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;
- }
+ if (!use_gui)
+ pars.display = false;
return pars;
}
projects / lyx.git / blobdiff