#include "lyxrc.h"
#include "debug.h"
#include "lyxlex.h"
+#include "frontends/lyx_gui.h"
using std::ostream;
+
InsetGraphicsParams::InsetGraphicsParams()
{
init();
}
+
InsetGraphicsParams::InsetGraphicsParams(InsetGraphicsParams const & igp)
{
// I decided to skip the initialization since the copy will overwrite
copy(igp);
}
+
InsetGraphicsParams &
InsetGraphicsParams::operator=(InsetGraphicsParams const & params)
{
// Are we assigning the object into itself?
if (this == ¶ms)
- return * this;
+ return *this;
copy(params);
return *this;
}
+
void InsetGraphicsParams::init()
{
filename.erase();
special.erase(); // additional userdefined stuff
}
+
void InsetGraphicsParams::copy(InsetGraphicsParams const & igp)
{
filename = igp.filename;
special = igp.special;
}
+
bool operator==(InsetGraphicsParams const & left,
InsetGraphicsParams const & right)
{
return false;
}
+
bool operator!=(InsetGraphicsParams const & left,
InsetGraphicsParams const & right)
{
return !(left == right);
}
-void InsetGraphicsParams::Write(ostream & os) const
+
+void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const
{
// Do not write the default values
if (!filename.empty()) {
- os << "\tfilename " << filename << '\n';
+ os << "\tfilename " << MakeRelPath(filename, bufpath) << '\n';
}
if (lyxscale != 100)
os << "\tlyxscale " << lyxscale << '\n';
}
-bool InsetGraphicsParams::Read(LyXLex & lex, string const & token)
+bool InsetGraphicsParams::Read(LyXLex & lex, string const & token, string const & bufpath)
{
if (token == "filename") {
lex.eatLine();
- filename = lex.getString();
+ filename = MakeAbsPath(lex.getString(), bufpath);
} else if (token == "lyxscale") {
lex.next();
lyxscale = lex.getInteger();
} else if (token == "subcaption") {
subcaption = true;
} else if (token == "subcaptionText") {
- lex.next();
- subcaptionText = lex.getString();
+ lex.eatLine();
+ string sub = lex.getString();
+ // strip surrounding " "
+ subcaptionText = sub.substr(1, sub.length() - 2);
} else if (token == "special") {
lex.eatLine();
special = lex.getString();
}
-grfx::Params InsetGraphicsParams::as_grfxParams(string const & filepath) const
+grfx::Params InsetGraphicsParams::as_grfxParams() const
{
grfx::Params pars;
pars.filename = filename;
pars.scale = lyxscale;
pars.angle = rotateAngle;
- if (!filepath.empty())
- pars.filename = MakeAbsPath(pars.filename, filepath);
-
if (clip) {
pars.bb = bb;
}
// Override the above if we're not using a gui
- if (!lyxrc.use_gui) {
+ if (!lyx_gui::use_gui) {
pars.display = grfx::NoDisplay;
}