* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
- * \author Jürgen Spitzmüller
+ * \author André Pönitz
+ * \author Jürgen Spitzmüller
*
* Full author contact details are available in file CREDITS.
*/
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "Text.h"
#include "Lexer.h"
#include "MetricsInfo.h"
#include "OutputParams.h"
+#include "output_xhtml.h"
+#include "Text.h"
#include "TextMetrics.h"
#include "frontends/FontMetrics.h"
namespace lyx {
-InsetNewpage::InsetNewpage()
+ InsetNewpage::InsetNewpage() : Inset(0)
{}
-InsetNewpage::InsetNewpage(InsetNewpageParams par)
-{
- params_.kind = par.kind;
-}
+InsetNewpage::InsetNewpage(InsetNewpageParams const & params)
+ : Inset(0), params_(params)
+{}
+
void InsetNewpageParams::write(ostream & os) const
{
void InsetNewpageParams::read(Lexer & lex)
{
- lex.next();
- string const command = lex.getString();
+ lex.setContext("InsetNewpageParams::read");
+ string token;
+ lex >> token;
- if (command == "newpage")
+ if (token == "newpage")
kind = InsetNewpageParams::NEWPAGE;
- else if (command == "pagebreak")
+ else if (token == "pagebreak")
kind = InsetNewpageParams::PAGEBREAK;
- else if (command == "clearpage")
+ else if (token == "clearpage")
kind = InsetNewpageParams::CLEARPAGE;
- else if (command == "cleardoublepage")
+ else if (token == "cleardoublepage")
kind = InsetNewpageParams::CLEARDOUBLEPAGE;
else
- lex.printError("InsetNewpage: Unknown kind: `$$Token'");
-
- string token;
- lex >> token;
- if (!lex)
- return;
- if (token != "\\end_inset")
- lex.printError("Missing \\end_inset at this point. "
- "Read: `$$Token'");
+ lex.printError("Unknown kind");
}
void InsetNewpage::read(Lexer & lex)
{
params_.read(lex);
+ lex >> "\\end_inset";
}
case LFUN_INSET_MODIFY: {
InsetNewpageParams params;
- InsetNewpageMailer::string2params(to_utf8(cmd.argument()), params);
+ string2params(to_utf8(cmd.argument()), params);
params_.kind = params.kind;
break;
}
case LFUN_INSET_MODIFY:
if (cmd.getArg(0) == "newpage") {
InsetNewpageParams params;
- InsetNewpageMailer::string2params(to_utf8(cmd.argument()), params);
+ string2params(to_utf8(cmd.argument()), params);
status.setOnOff(params_.kind == params.kind);
- } else
- status.enabled(true);
+ }
+ status.setEnabled(true);
return true;
default:
return Inset::getStatus(cur, cmd, status);
ColorCode InsetNewpage::ColorName() const
{
switch (params_.kind) {
- case InsetNewpageParams::NEWPAGE:
- return Color_newpage;
- break;
case InsetNewpageParams::PAGEBREAK:
return Color_pagebreak;
break;
+ case InsetNewpageParams::NEWPAGE:
case InsetNewpageParams::CLEARPAGE:
- return Color_newpage;
- break;
case InsetNewpageParams::CLEARDOUBLEPAGE:
return Color_newpage;
break;
- default:
- return Color_newpage;
- break;
}
+ // not really useful, but to avoids gcc complaints
+ return Color_newpage;
}
}
-docstring InsetNewpage::contextMenu(BufferView const &, int, int) const
+docstring InsetNewpage::xhtml(XHTMLStream & xs, OutputParams const &) const
{
- return from_ascii("context-newpage");
+ xs << CompTag("br");
+ return docstring();
}
-string const InsetNewpageMailer::name_ = "newpage";
-
-
-InsetNewpageMailer::InsetNewpageMailer(InsetNewpage & inset)
- : inset_(inset)
-{}
-
-
-string const InsetNewpageMailer::inset2string(Buffer const &) const
+docstring InsetNewpage::contextMenu(BufferView const &, int, int) const
{
- return params2string(inset_.params());
+ return from_ascii("context-newpage");
}
-void InsetNewpageMailer::string2params(string const & in, InsetNewpageParams & params)
+void InsetNewpage::string2params(string const & in, InsetNewpageParams & params)
{
params = InsetNewpageParams();
if (in.empty())
return;
istringstream data(in);
- Lexer lex(0,0);
+ Lexer lex;
lex.setStream(data);
string name;
lex >> name;
- if (!lex || name != name_)
- return print_mailer_error("InsetNewpageMailer", in, 1, name_);
+ if (!lex || name != "newpage") {
+ LYXERR0("Expected arg 2 to be \"wrap\" in " << in);
+ return;
+ }
params.read(lex);
}
-string const InsetNewpageMailer::params2string(InsetNewpageParams const & params)
+string InsetNewpage::params2string(InsetNewpageParams const & params)
{
ostringstream data;
- data << name_ << ' ';
+ data << "newpage" << ' ';
params.write(data);
return data.str();
}