#include "BufferParams.h"
#include "debug.h"
#include "gettext.h"
+#include "Layout.h"
#include "output.h"
#include "OutputParams.h"
#include "Paragraph.h"
depth_type depth = par.params().depth();
// First write the layout
- string const & tmp = par.layout()->name();
+ string const tmp = to_utf8(par.layout()->name());
if (compare_ascii_no_case(tmp, "itemize") == 0) {
ltype = 1;
ltype_depth = depth + 1;
case 6: // Abstract
if (runparams.linelen > 0) {
- os << _("Abstract") << "\n\n";
+ os << buf.B_("Abstract") << "\n\n";
currlinelen = 0;
} else {
- docstring const abst = _("Abstract: ");
+ docstring const abst = buf.B_("Abstract: ");
os << abst;
currlinelen += abst.length();
}
case 7: // Bibliography
if (!ref_printed) {
if (runparams.linelen > 0) {
- os << _("References") << "\n\n";
+ os << buf.B_("References") << "\n\n";
currlinelen = 0;
} else {
- docstring const refs = _("References: ");
+ docstring const refs = buf.B_("References: ");
os << refs;
currlinelen += refs.length();
}
char_type c = par.getUChar(buf.params(), i);
- if (c == Paragraph::META_INSET || c == ' ') {
+ if (par.isInset(i) || c == ' ') {
if (runparams.linelen > 0 &&
currlinelen + word.length() > runparams.linelen) {
os << '\n';
word.erase();
}
- switch (c) {
- case Paragraph::META_INSET: {
+ if (par.isInset(i)) {
OutputParams rp = runparams;
rp.depth = par.params().depth();
int len = par.getInset(i)->plaintext(buf, os, rp);
- if (len >= InsetBase::PLAINTEXT_NEWLINE)
- currlinelen = len - InsetBase::PLAINTEXT_NEWLINE;
+ if (len >= Inset::PLAINTEXT_NEWLINE)
+ currlinelen = len - Inset::PLAINTEXT_NEWLINE;
else
currlinelen += len;
- break;
+ continue;
}
+ switch (c) {
case ' ':
os << ' ';
currlinelen++;
break;
case '\0':
- LYXERR(Debug::INFO) <<
- "writePlaintextFile: NULL char in structure." << endl;
+ LYXERR(Debug::INFO, "writePlaintextFile: NULL char in structure.");
break;
default: