* \author Asger Alstrup Nielsen
* \author Jean-Marc Lasgouttes
* \author Lars Gullik Bjønnes
- * \author Juergen Spitzmueller
+ * \author Jürgen Spitzmüller
*
* Full author contact details are available in file CREDITS.
*/
#include "insetspace.h"
#include "debug.h"
-#include "dimension.h"
-#include "LaTeXFeatures.h"
-#include "latexrunparams.h"
-#include "BufferView.h"
-#include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
+#include "LColor.h"
#include "lyxlex.h"
-#include "lyxfont.h"
#include "metricsinfo.h"
+#include "outputparams.h"
-using std::ostream;
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+
+
+using std::string;
using std::max;
using std::auto_ptr;
+using std::ostream;
InsetSpace::InsetSpace()
}
-void InsetSpace::write(Buffer const *, ostream & os) const
+void InsetSpace::write(Buffer const &, ostream & os) const
{
string command;
switch (kind_) {
case NORMAL:
- command = "\\space";
+ command = "\\space{}";
break;
case PROTECTED:
command = "~";
break;
case THIN:
- command = "\\,";
+ command = "\\thinspace{}";
break;
case QUAD:
command = "\\quad{}";
}
-// This function will not be necessary when lyx3
-void InsetSpace::read(Buffer const *, LyXLex & lex)
+void InsetSpace::read(Buffer const &, LyXLex & lex)
{
- lex.nextToken();
+ lex.next();
string const command = lex.getString();
- if (command == "\\space")
+ if (command == "\\space{}")
kind_ = NORMAL;
else if (command == "~")
kind_ = PROTECTED;
- else if (command == "\\,")
+ else if (command == "\\thinspace{}")
kind_ = THIN;
else if (command == "\\quad{}")
kind_ = QUAD;
}
-int InsetSpace::latex(Buffer const *, ostream & os,
- LatexRunParams const & runparams) const
+int InsetSpace::latex(Buffer const &, ostream & os,
+ OutputParams const & runparams) const
{
switch (kind_) {
case NORMAL:
}
-int InsetSpace::ascii(Buffer const *, ostream & os, int) const
+int InsetSpace::plaintext(Buffer const &, ostream & os,
+ OutputParams const &) const
{
switch (kind_) {
case NORMAL:
}
-int InsetSpace::linuxdoc(Buffer const *, ostream & os) const
+int InsetSpace::linuxdoc(Buffer const &, ostream & os,
+ OutputParams const &) const
{
switch (kind_) {
case NORMAL:
}
-int InsetSpace::docbook(Buffer const *, ostream & os, bool) const
+int InsetSpace::docbook(Buffer const &, ostream & os,
+ OutputParams const &) const
{
switch (kind_) {
case NORMAL:
}
-auto_ptr<InsetBase> InsetSpace::clone() const
+int InsetSpace::textString(Buffer const & buf, ostream & os,
+ OutputParams const & op) const
+{
+ return plaintext(buf, os, op);
+}
+
+
+auto_ptr<InsetBase> InsetSpace::doClone() const
{
return auto_ptr<InsetBase>(new InsetSpace(kind_));
}
{
return true;
}
-
-bool InsetSpace::isLineSeparator() const
-{
- return false;
-}