#include "Lexer.h"
#include "output_xhtml.h"
#include "ParIterator.h"
+#include "TexRow.h"
+#include "texstream.h"
#include "TextClass.h"
#include "support/debug.h"
#include "frontends/Application.h"
using namespace std;
+using namespace lyx::support;
namespace lyx {
//
// Lgb
-
-InsetFloat::InsetFloat(Buffer * buf, string const & type)
- : InsetCollapsable(buf), name_(from_utf8(type))
+//FIXME: why do we set in stone the type here?
+InsetFloat::InsetFloat(Buffer * buf, string params_str)
+ : InsetCaptionable(buf)
{
- setLabel(_("float: ") + floatName(type));
- params_.type = type;
+ string2params(params_str, params_);
+ setCaptionType(params_.type);
}
-InsetFloat::~InsetFloat()
+// Enforce equality of float type and caption type.
+void InsetFloat::setCaptionType(std::string const & type)
{
- hideDialogs("float", this);
+ InsetCaptionable::setCaptionType(type);
+ params_.type = captionType();
+ // check if the float type exists
+ if (buffer().params().documentClass().floats().typeExist(params_.type))
+ setNewLabel();
+ else
+ setLabel(bformat(_("ERROR: Unknown float type: %1$s"), from_utf8(params_.type)));
}
-docstring InsetFloat::name() const
-{
- return "Float:" + name_;
+docstring InsetFloat::layoutName() const
+{
+ return "Float:" + from_utf8(params_.type);
}
docstring InsetFloat::toolTip(BufferView const & bv, int x, int y) const
{
- if (InsetCollapsable::toolTip(bv, x, y).empty() || isOpen(bv))
- return docstring();
+ if (isOpen(bv))
+ return InsetCaptionable::toolTip(bv, x, y);
OutputParams rp(&buffer().params().encoding());
return getCaptionText(rp);
void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_MODIFY: {
InsetFloatParams params;
string2params(to_utf8(cmd.argument()), params);
+ cur.recordUndoInset(this);
// placement, wide and sideways are not used for subfloats
if (!params_.subfloat) {
params_.wide = params.wide;
params_.sideways = params.sideways;
}
-
+ params_.alignment = params.alignment;
setNewLabel();
+ if (params_.type != params.type)
+ setCaptionType(params.type);
+ // what we really want here is a TOC update, but that means
+ // a full buffer update
+ cur.forceBufferUpdate();
break;
}
}
default:
- InsetCollapsable::doDispatch(cur, cmd);
+ InsetCaptionable::doDispatch(cur, cmd);
break;
}
}
bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_MODIFY:
case LFUN_INSET_DIALOG_UPDATE:
return true;
case LFUN_INSET_SETTINGS:
- if (InsetCollapsable::getStatus(cur, cmd, flag)) {
+ if (InsetCaptionable::getStatus(cur, cmd, flag)) {
flag.setEnabled(flag.enabled() && !params_.subfloat);
return true;
} else
return false;
+ case LFUN_NEWLINE_INSERT:
+ if (params_.subfloat) {
+ flag.setEnabled(false);
+ return true;
+ }
+ // no subfloat:
+ // fall through
+
default:
- return InsetCollapsable::getStatus(cur, cmd, flag);
+ return InsetCaptionable::getStatus(cur, cmd, flag);
}
}
-void InsetFloat::updateLabels(ParIterator const & it, bool out)
+bool InsetFloat::hasSubCaptions(ParIterator const & it) const
+{
+ return (it.innerInsetOfType(FLOAT_CODE) || it.innerInsetOfType(WRAP_CODE));
+}
+
+
+string InsetFloat::getAlignment() const
{
- Counters & cnts =
- buffer().masterBuffer()->params().documentClass().counters();
- if (out) {
- // counters are local to the float
- cnts.saveLastCounter();
+ string alignment;
+ string const buf_alignment = buffer().params().float_alignment;
+ if (params_.alignment == "document"
+ && !buf_alignment.empty()) {
+ alignment = buf_alignment;
+ } else if (!params_.alignment.empty()
+ && params_.alignment != "class"
+ && params_.alignment != "document") {
+ alignment = params_.alignment;
}
- string const saveflt = cnts.current_float();
- bool const savesubflt = cnts.isSubfloat();
-
- bool const subflt = (it.innerInsetOfType(FLOAT_CODE)
- || it.innerInsetOfType(WRAP_CODE));
- // floats can only embed subfloats of their own kind
- if (subflt)
- params_.type = saveflt;
- setSubfloat(subflt);
-
- // Tell to captions what the current float is
- cnts.current_float(params().type);
- cnts.isSubfloat(subflt);
-
- InsetCollapsable::updateLabels(it, out);
-
- //reset afterwards
- cnts.current_float(saveflt);
- if (out)
- cnts.restoreLastCounter();
- cnts.isSubfloat(savesubflt);
+ return alignment;
+}
+
+
+LyXAlignment InsetFloat::contentAlignment() const
+{
+ LyXAlignment align = LYX_ALIGN_NONE;
+ string alignment = getAlignment();
+ if (alignment == "left")
+ align = LYX_ALIGN_LEFT;
+ else if (alignment == "center")
+ align = LYX_ALIGN_CENTER;
+ else if (alignment == "right")
+ align = LYX_ALIGN_RIGHT;
+
+ return align;
}
void InsetFloatParams::write(ostream & os) const
{
- os << "Float " << type << '\n';
+ if (type.empty()) {
+ // Better this than creating a parse error. This in fact happens in the
+ // parameters dialog via InsetFloatParams::params2string.
+ os << "senseless" << '\n';
+ } else
+ os << type << '\n';
if (!placement.empty())
os << "placement " << placement << "\n";
+ if (!alignment.empty())
+ os << "alignment " << alignment << "\n";
if (wide)
os << "wide true\n";
void InsetFloatParams::read(Lexer & lex)
{
lex.setContext("InsetFloatParams::read");
+ lex >> type;
if (lex.checkFor("placement"))
lex >> placement;
+ if (lex.checkFor("alignment"))
+ lex >> alignment;
lex >> "wide" >> wide;
lex >> "sideways" >> sideways;
}
void InsetFloat::write(ostream & os) const
{
+ os << "Float ";
params_.write(os);
- InsetCollapsable::write(os);
+ InsetCaptionable::write(os);
}
void InsetFloat::read(Lexer & lex)
{
params_.read(lex);
- InsetCollapsable::read(lex);
+ InsetCaptionable::read(lex);
+ setCaptionType(params_.type);
}
features.useFloat(params_.type, features.inFloat());
features.inFloat(true);
- InsetCollapsable::validate(features);
+ InsetCaptionable::validate(features);
features.inFloat(false);
}
odocstringstream ods;
XHTMLStream newxs(ods);
newxs << html::StartTag(htmltype, attr);
- InsetText::XHTMLOptions const opts =
+ InsetText::XHTMLOptions const opts =
InsetText::WriteLabel | InsetText::WriteInnerTag;
docstring deferred = InsetText::insetAsXHTML(newxs, rp, opts);
newxs << html::EndTag(htmltype);
- if (rp.inFloat == OutputParams::NONFLOAT)
+ if (rp.inFloat == OutputParams::NONFLOAT) {
// In this case, this float needs to be deferred, but we'll put it
// before anything the text itself deferred.
deferred = ods.str() + '\n' + deferred;
- else
+ } else {
// In this case, the whole thing is already being deferred, so
// we can write to the stream.
- // Note that things will already have been escaped, so we do not
+ // Note that things will already have been escaped, so we do not
// want to escape them again.
- xs << XHTMLStream::NextRaw() << ods.str();
+ xs << XHTMLStream::ESCAPE_NONE << ods.str();
+ }
return deferred;
}
-int InsetFloat::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const
{
if (runparams_in.inFloat != OutputParams::NONFLOAT) {
+ if (!paragraphs().empty() && !runparams_in.nice)
+ // improve TexRow precision in non-nice mode
+ os << safebreakln;
+
if (runparams_in.moving_arg)
os << "\\protect";
os << "\\subfloat";
-
+
OutputParams rp = runparams_in;
- docstring const caption = getCaption(rp);
- if (!caption.empty()) {
- os << caption;
- }
+ rp.moving_arg = true;
+ os << getCaption(rp);
os << '{';
+ // The main argument is the contents of the float. This is not a moving argument.
+ rp.moving_arg = false;
rp.inFloat = OutputParams::SUBFLOAT;
- int const i = InsetText::latex(os, rp);
+ InsetText::latex(os, rp);
os << "}";
-
- return i + 1;
+
+ return;
}
OutputParams runparams(runparams_in);
runparams.inFloat = OutputParams::MAINFLOAT;
FloatList const & floats = buffer().params().documentClass().floats();
string tmptype = params_.type;
- if (params_.sideways)
+ if (params_.sideways && floats.allowsSideways(params_.type))
tmptype = "sideways" + params_.type;
- if (params_.wide && (!params_.sideways ||
- params_.type == "figure" ||
- params_.type == "table"))
+ if (params_.wide && floats.allowsWide(params_.type)
+ && (!params_.sideways ||
+ params_.type == "figure" ||
+ params_.type == "table"))
tmptype += "*";
// Figure out the float placement to use.
// From lowest to highest:
// - float default placement
// - document wide default placement
// - specific float placement
- string placement;
+ string tmpplacement;
string const buf_placement = buffer().params().float_placement;
string const def_placement = floats.defaultPlacement(params_.type);
- if (!params_.placement.empty()
- && params_.placement != def_placement) {
- placement = params_.placement;
- } else if (params_.placement.empty()
- && !buf_placement.empty()
- && buf_placement != def_placement) {
- placement = buf_placement;
+ if (params_.placement == "document"
+ && !buf_placement.empty()
+ && buf_placement != def_placement) {
+ tmpplacement = buf_placement;
+ } else if (!params_.placement.empty()
+ && params_.placement != "document"
+ && params_.placement != def_placement) {
+ tmpplacement = params_.placement;
+ }
+
+ // Check if placement is allowed by this float
+ string const allowed_placement =
+ floats.allowedPlacement(params_.type);
+ string placement;
+ string::const_iterator lit = tmpplacement.begin();
+ string::const_iterator end = tmpplacement.end();
+ for (; lit != end; ++lit) {
+ if (contains(allowed_placement, *lit))
+ placement += *lit;
}
- // The \n is used to force \begin{<floatname>} to appear in a new line.
- // The % is needed to prevent two consecutive \n chars in the case
- // when the current output line is empty.
- os << "%\n\\begin{" << from_ascii(tmptype) << '}';
+ // Force \begin{<floatname>} to appear in a new line.
+ os << breakln << "\\begin{" << from_ascii(tmptype) << '}';
+ if (runparams.lastid != -1)
+ os.texrow().start(runparams.lastid, runparams.lastpos);
// We only output placement if different from the def_placement.
- // sidewaysfloats always use their own page
- if (!placement.empty() && !params_.sideways) {
+ // sidewaysfloats always use their own page,
+ // therefore don't output the p option that is always set
+ if (!placement.empty()
+ && (!params_.sideways || (params_.sideways && from_ascii(placement) != "p")))
os << '[' << from_ascii(placement) << ']';
- }
os << '\n';
- int const i = InsetText::latex(os, runparams);
+ string alignment = getAlignment();
+ if (alignment == "left")
+ os << "\\raggedright" << breakln;
+ else if (alignment == "center")
+ os << "\\centering" << breakln;
+ else if (alignment == "right")
+ os << "\\raggedleft" << breakln;
- // The \n is used to force \end{<floatname>} to appear in a new line.
- // In this case, we do not case if the current output line is empty.
- os << "\n\\end{" << from_ascii(tmptype) << "}\n";
+ InsetText::latex(os, runparams);
- return i + 4;
+ // Force \end{<floatname>} to appear in a new line.
+ os << breakln << "\\end{" << from_ascii(tmptype) << "}\n";
+
+ // A new paragraph is always started after a float. Hence, simulate a
+ // blank line so that os.afterParbreak() returns true (see bug 11174).
+ os.lastChar('\n');
}
-int InsetFloat::plaintext(odocstream & os, OutputParams const & runparams) const
+int InsetFloat::plaintext(odocstringstream & os, OutputParams const & runparams, size_t max_length) const
{
os << '[' << buffer().B_("float") << ' '
<< floatName(params_.type) << ":\n";
- InsetText::plaintext(os, runparams);
+ InsetText::plaintext(os, runparams, max_length);
os << "\n]";
return PLAINTEXT_NEWLINE + 1; // one char on a separate line
bool InsetFloat::insetAllowed(InsetCode code) const
{
- // The case that code == FLOAT_CODE is handled in Text3.cpp,
+ // The case that code == FLOAT_CODE is handled in Text3.cpp,
// because we need to know what type of float is meant.
switch(code) {
case WRAP_CODE:
case MARGIN_CODE:
return false;
default:
- return InsetCollapsable::insetAllowed(code);
+ return InsetCaptionable::insetAllowed(code);
}
}
-bool InsetFloat::showInsetDialog(BufferView * bv) const
-{
- if (!InsetText::showInsetDialog(bv))
- bv->showDialog("float", params2string(params()),
- const_cast<InsetFloat *>(this));
- return true;
-}
-
-
void InsetFloat::setWide(bool w, bool update_label)
{
- params_.wide = w;
+ if (!buffer().params().documentClass().floats().allowsWide(params_.type))
+ params_.wide = false;
+ else
+ params_.wide = w;
if (update_label)
setNewLabel();
}
void InsetFloat::setSideways(bool s, bool update_label)
{
- params_.sideways = s;
+ if (!buffer().params().documentClass().floats().allowsSideways(params_.type))
+ params_.sideways = false;
+ else
+ params_.sideways = s;
if (update_label)
setNewLabel();
}
lab += floatName(params_.type);
- if (params_.wide)
+ FloatList const & floats = buffer().params().documentClass().floats();
+
+ if (params_.wide && floats.allowsWide(params_.type))
lab += '*';
- if (params_.sideways)
+ if (params_.sideways && floats.allowsSideways(params_.type))
lab += _(" (sideways)");
setLabel(lab);
}
-docstring InsetFloat::getCaption(OutputParams const & runparams) const
+bool InsetFloat::allowsCaptionVariation(std::string const & newtype) const
{
- if (paragraphs().empty())
- return docstring();
+ return !params_.subfloat && newtype != "Unnumbered";
+}
+
+TexString InsetFloat::getCaption(OutputParams const & runparams) const
+{
InsetCaption const * ins = getCaptionInset();
if (ins == 0)
- return docstring();
-
- odocstringstream ods;
- ins->getOptArg(ods, runparams);
- ods << '[';
- ins->getArgument(ods, runparams);
- ods << ']';
- return ods.str();
+ return TexString();
+
+ otexstringstream os;
+ ins->getArgs(os, runparams);
+
+ if (!runparams.nice)
+ // increase TexRow precision in non-nice mode
+ os << safebreakln;
+ os << '[';
+ otexstringstream os2;
+ ins->getArgument(os2, runparams);
+ TexString ts = os2.release();
+ docstring & arg = ts.str;
+ // Protect ']'
+ if (arg.find(']') != docstring::npos)
+ arg = '{' + arg + '}';
+ os << move(ts);
+ os << ']';
+ if (!runparams.nice)
+ os << safebreakln;
+ return os.release();
}
Lexer lex;
lex.setStream(data);
lex.setContext("InsetFloat::string2params");
- lex >> "float" >> "Float";
- lex >> params.type; // We have to read the type here!
params.read(lex);
}
string InsetFloat::params2string(InsetFloatParams const & params)
{
ostringstream data;
- data << "float" << ' ';
params.write(data);
return data.str();
}
projects / lyx.git / blobdiff