#include "layout.h"
#include "buffer.h"
#include "BufferView.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "LaTeXFeatures.h"
#include "insets/insettabular.h"
#include "insets/insettext.h"
#include <algorithm>
#include <cstdlib>
+using std::abs;
using std::ostream;
using std::istream;
using std::getline;
Paragraph * par = new Paragraph;
Paragraph * return_par = 0;
- par->layout(textclasslist[bp.textclass].defaultLayoutName());
+ par->layout(textclasslist[bp.textclass].defaultLayout());
+
string tmptok;
int pos = 0;
Paragraph::depth_type depth = 0;
if (token.empty())
continue;
if (token == "\\layout"
- || token == "\\end_float"
- || token == "\\end_deeper") {
+ || token == "\\end_float" // this should not exist anymore
+ || token == "\\end_inset" // as it is substituted by this
+ || token == "\\end_deeper")
+ {
lex.pushToken(token);
#ifndef NO_COMPABILITY
// Here we need to insert the inset_ert_contents into the last
#endif
break;
}
+#ifndef NO_COMPABILITY
+ if (token == "\\newline")
+ // Here we need to insert the inset_ert_contents into the last
+ // cell of the tabular.
+ owner_->bufferOwner()->insertErtContents(par, pos, false);
+#endif
if (owner_->bufferOwner()->parseSingleLyXformat2Token(lex, par,
return_par,
token, pos,
}
os << ">";
- ret += GetCellInset(cell)->docbook(buf, os);
+ ret += GetCellInset(cell)->docbook(buf, os, true);
os << "</entry>\n";
++cell;
}
}
-int LyXTabular::docBook(Buffer const * buf, ostream & os) const
+int LyXTabular::docbook(Buffer const * buf, ostream & os,
+ bool /*mixcont*/) const
{
int ret = 0;
ret += docbookRow(buf, os, i);
}
}
- os << "<thead>\n";
+ os << "</thead>\n";
++ret;
}
// output footer info