* Licence details can be found in the file COPYING.
*
* \author John Levon
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
*
* Full author contact details are available in file CREDITS.
*/
#include "InsetNewline.h"
+#include "Cursor.h"
#include "Dimension.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "Lexer.h"
#include "MetricsInfo.h"
#include "OutputParams.h"
+#include "output_xhtml.h"
#include "frontends/Application.h"
#include "frontends/FontMetrics.h"
namespace lyx {
-InsetNewline::InsetNewline()
+InsetNewline::InsetNewline() : Inset(0)
{}
kind = InsetNewlineParams::LINEBREAK;
else
lex.printError("Unknown kind: `$$Token'");
- lex >> "\\end_inset";
}
void InsetNewline::read(Lexer & lex)
{
params_.read(lex);
+ lex >> "\\end_inset";
}
void InsetNewline::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_MODIFY: {
InsetNewlineParams params;
+ cur.recordUndo();
string2params(to_utf8(cmd.argument()), params);
params_.kind = params.kind;
break;
bool InsetNewline::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & status) const
{
- switch (cmd.action) {
+ switch (cmd.action()) {
// we handle these
case LFUN_INSET_MODIFY:
if (cmd.getArg(0) == "newline") {
string2params(to_utf8(cmd.argument()), params);
status.setOnOff(params_.kind == params.kind);
}
- status.enabled(true);
+ status.setEnabled(true);
return true;
default:
return Inset::getStatus(cur, cmd, status);
case InsetNewlineParams::LINEBREAK:
return Color_pagebreak;
break;
- default:
- return Color_eolmarker;
- break;
}
+ // not really useful, but to avoids gcc complaints
+ return Color_eolmarker;
}
-int InsetNewline::latex(odocstream & os, OutputParams const &) const
+void InsetNewline::latex(otexstream & os, OutputParams const & rp) const
{
switch (params_.kind) {
case InsetNewlineParams::NEWLINE:
- os << "\\\\\n";
+ if (rp.inTableCell == OutputParams::PLAIN)
+ os << "\\newline\n";
+ else
+ os << "\\\\\n";
break;
case InsetNewlineParams::LINEBREAK:
os << "\\linebreak{}\n";
os << "\\\\\n";
break;
}
- return 0;
}
-int InsetNewline::plaintext(odocstream & os, OutputParams const &) const
+int InsetNewline::plaintext(odocstringstream & os,
+ OutputParams const &, size_t) const
{
os << '\n';
return PLAINTEXT_NEWLINE;
}
+docstring InsetNewline::xhtml(XHTMLStream & xs, OutputParams const &) const
+{
+ xs << html::CR() << html::CompTag("br") << html::CR();
+ return docstring();
+}
+
+
void InsetNewline::draw(PainterInfo & pi, int x, int y) const
{
FontInfo font;
}
-docstring InsetNewline::contextMenu(BufferView const &, int, int) const
+string InsetNewline::contextMenuName() const
{
- return from_ascii("context-newline");
+ return "context-newline";
}