#include "ParagraphParameters.h"
#include "lyxtextclasslist.h"
#include "debug.h"
+#include "gettext.h"
#include "language.h"
#include "encoding.h"
#include "lyxrc.h"
+#include "lyxlex.h"
+#include "factory.h"
+#include "Lsstream.h"
#include "support/lstrings.h"
#include "insets/insetoptarg.h"
+#include "insets/insetcommandparams.h"
+#include "insets/insetbibitem.h"
+#include "insets/insetspace.h"
+#include "insets/insetspecialchar.h"
+#include "insets/insetlatexaccent.h"
+#include "insets/insettabular.h"
+#include "insets/insethfill.h"
+#include "insets/insetnewline.h"
extern string bibitemWidest(Buffer const *);
+using namespace lyx::support;
+
using lyx::pos_type;
//using lyx::layout_type;
using std::endl;
using std::ostream;
+
void breakParagraph(BufferParams const & bparams,
+ ParagraphList & paragraphs,
ParagraphList::iterator par,
pos_type pos,
int flag)
{
// create a new paragraph, and insert into the list
- Paragraph * tmp = new Paragraph(&*par);
+ ParagraphList::iterator tmp = paragraphs.insert(boost::next(par),
+ Paragraph());
+
// without doing that we get a crash when typing <Return> at the
// end of a paragraph
tmp->layout(bparams.getLyXTextClass().defaultLayout());
tmp->setLabelWidthString(par->params().labelWidthString());
}
- bool const isempty = (par->layout()->keepempty && par->empty());
+ bool const isempty = (par->allowEmpty() && par->empty());
if (!isempty && (par->size() > pos || par->empty() || flag == 2)) {
tmp->layout(par->layout());
void breakParagraphConservative(BufferParams const & bparams,
+ ParagraphList & paragraphs,
ParagraphList::iterator par,
pos_type pos)
{
// create a new paragraph
- Paragraph * tmp = new Paragraph(&*par);
- tmp->makeSameLayout(&*par);
+ ParagraphList::iterator tmp = paragraphs.insert(boost::next(par),
+ Paragraph());
+ tmp->makeSameLayout(*par);
- // When can pos > Last()?
- // I guess pos == Last() is possible.
+ // When can pos > size()?
+ // I guess pos == size() is possible.
if (par->size() > pos) {
// copy everything behind the break-position to the new
// paragraph
}
-void mergeParagraph(Buffer * buf, ParagraphList::iterator par)
+void mergeParagraph(BufferParams const & bparams,
+ ParagraphList & paragraphs,
+ ParagraphList::iterator par)
{
- BufferParams const & bparams = buf->params;
-
ParagraphList::iterator the_next = boost::next(par);
// first the DTP-stuff
++j;
}
- buf->paragraphs.erase(the_next);
+ paragraphs.erase(the_next);
}
-#if 0
-Paragraph * depthHook(Paragraph * par, Paragraph::depth_type depth)
+ParagraphList::iterator depthHook(ParagraphList::iterator pit,
+ ParagraphList const & plist,
+ Paragraph::depth_type depth)
{
- Paragraph * newpar = par;
+ ParagraphList::iterator newpit = pit;
+ ParagraphList::iterator beg = const_cast<ParagraphList&>(plist).begin();
- do {
- newpar = newpar->previous();
- } while (newpar && newpar->getDepth() > depth);
-
- if (!newpar) {
- if (par->previous() || par->getDepth())
- lyxerr << "Error (depthHook): "
- << "no hook." << endl;
- newpar = par;
+ if (newpit != beg)
+ --newpit;
+
+ while (newpit != beg && newpit->getDepth() > depth) {
+ --newpit;
}
- return newpar;
+
+ if (newpit->getDepth() > depth)
+ return pit;
+
+ return newpit;
}
-Paragraph * outerHook(Paragraph * par)
+ParagraphList::iterator outerHook(ParagraphList::iterator pit,
+ ParagraphList const & plist)
{
- if (!par->getDepth())
- return 0;
- return depthHook(par, Paragraph::depth_type(par->getDepth() - 1));
+ if (!pit->getDepth())
+ return const_cast<ParagraphList&>(plist).end();
+ return depthHook(pit, plist,
+ Paragraph::depth_type(pit->getDepth() - 1));
}
-bool isFirstInSequence(Paragraph * par)
+bool isFirstInSequence(ParagraphList::iterator pit,
+ ParagraphList const & plist)
{
- Paragraph const * dhook = depthHook(par, par->getDepth());
- return (dhook == par
- || dhook->getLayout() != par->getLayout()
- || dhook->getDepth() != par->getDepth());
+ ParagraphList::iterator dhook = depthHook(pit, plist, pit->getDepth());
+ return (dhook == pit
+ || dhook->layout() != pit->layout()
+ || dhook->getDepth() != pit->getDepth());
}
-int getEndLabel(Paragraph * para, BufferParams const & bparams)
+int getEndLabel(ParagraphList::iterator p, ParagraphList const & plist)
{
- Paragraph * par = para;
- while (par) {
- Paragraph::depth_type par_depth = par->getDepth();
- layout_type layout = par->getLayout();
- int const endlabeltype =
- textclasslist.Style(bparams.textclass,
- layout).endlabeltype;
+ ParagraphList::iterator pit = p;
+ Paragraph::depth_type par_depth = p->getDepth();
+ while (pit != const_cast<ParagraphList&>(plist).end()) {
+ LyXLayout_ptr const & layout = pit->layout();
+ int const endlabeltype = layout->endlabeltype;
+
if (endlabeltype != END_LABEL_NO_LABEL) {
- if (!para->next())
+ if (boost::next(p) == const_cast<ParagraphList&>(plist).end())
return endlabeltype;
- Paragraph::depth_type const next_depth =
- para->next()->getDepth();
+ Paragraph::depth_type const next_depth = boost::next(p)->getDepth();
if (par_depth > next_depth ||
- (par_depth == next_depth
- && layout != para->next()->getLayout()))
+ (par_depth == next_depth &&
+ layout != boost::next(p)->layout()))
return endlabeltype;
break;
}
if (par_depth == 0)
break;
- par = outerHook(par);
+ pit = outerHook(pit, plist);
+ if (pit != const_cast<ParagraphList&>(plist).end())
+ par_depth = pit->getDepth();
}
return END_LABEL_NO_LABEL;
}
-#endif
+
+
+namespace {
+
+ParagraphList::iterator
+TeXEnvironment(Buffer const * buf,
+ ParagraphList const & paragraphs,
+ ParagraphList::iterator pit,
+ ostream & os, TexRow & texrow,
+ LatexRunParams const & runparams);
+
+ParagraphList::iterator
+TeXOnePar(Buffer const * buf,
+ ParagraphList const & paragraphs,
+ ParagraphList::iterator pit,
+ ostream & os, TexRow & texrow,
+ LatexRunParams const & runparams,
+ string const & everypar = string());
ParagraphList::iterator
TeXDeeper(Buffer const * buf,
- BufferParams const & bparams,
+ ParagraphList const & paragraphs,
ParagraphList::iterator pit,
- ostream & os, TexRow & texrow)
+ ostream & os, TexRow & texrow,
+ LatexRunParams const & runparams)
{
lyxerr[Debug::LATEX] << "TeXDeeper... " << &*pit << endl;
ParagraphList::iterator par = pit;
- while (par != buf->paragraphs.end()&& par->params().depth() == pit->params().depth()) {
+ while (par != const_cast<ParagraphList&>(paragraphs).end() &&
+ par->params().depth() == pit->params().depth()) {
if (par->layout()->isEnvironment()) {
- par = TeXEnvironment(buf, bparams, par,
- os, texrow);
+ par = TeXEnvironment(buf, paragraphs, par,
+ os, texrow, runparams);
} else {
- par = TeXOnePar(buf, bparams, par,
- os, texrow, false);
+ par = TeXOnePar(buf, paragraphs, par,
+ os, texrow, runparams);
}
}
lyxerr[Debug::LATEX] << "TeXDeeper...done " << &*par << endl;
ParagraphList::iterator
TeXEnvironment(Buffer const * buf,
- BufferParams const & bparams,
+ ParagraphList const & paragraphs,
ParagraphList::iterator pit,
- ostream & os, TexRow & texrow)
+ ostream & os, TexRow & texrow,
+ LatexRunParams const & runparams)
{
lyxerr[Debug::LATEX] << "TeXEnvironment... " << &*pit << endl;
+ BufferParams const & bparams = buf->params;
+
LyXLayout_ptr const & style = pit->layout();
Language const * language = pit->getParLanguage(bparams);
Language const * doc_language = bparams.language;
- Language const * previous_language = pit->previous()
- ? pit->previous()->getParLanguage(bparams) : doc_language;
+ Language const * previous_language =
+ (pit != const_cast<ParagraphList&>(paragraphs).begin())
+ ? boost::prior(pit)->getParLanguage(bparams)
+ : doc_language;
if (language->babel() != previous_language->babel()) {
if (!lyxrc.language_command_end.empty() &&
}
ParagraphList::iterator par = pit;
do {
- par = TeXOnePar(buf, bparams, par, os, texrow, false);
+ par = TeXOnePar(buf, paragraphs, par, os, texrow, runparams);
- if (par != buf->paragraphs.end()&& par->params().depth() > pit->params().depth()) {
+ if (par != const_cast<ParagraphList&>(paragraphs).end() && par->params().depth() > pit->params().depth()) {
if (par->layout()->isParagraph()) {
// Thinko!
os << '\n';
texrow.newline();
}
- par = TeXDeeper(buf, bparams, par, os, texrow);
+ par = TeXDeeper(buf, paragraphs, par, os, texrow,
+ runparams);
}
- } while (par != buf->paragraphs.end()
+ } while (par != const_cast<ParagraphList&>(paragraphs).end()
&& par->layout() == pit->layout()
&& par->params().depth() == pit->params().depth()
&& par->params().leftIndent() == pit->params().leftIndent());
}
-namespace {
-
InsetOptArg * optArgInset(Paragraph const & par)
{
// Find the entry.
- InsetList::iterator it = par.insetlist.begin();
- InsetList::iterator end = par.insetlist.end();
+ InsetList::const_iterator it = par.insetlist.begin();
+ InsetList::const_iterator end = par.insetlist.end();
for (; it != end; ++it) {
- Inset * ins = it.getInset();
+ Inset * ins = it->inset;
if (ins->lyxCode() == Inset::OPTARG_CODE) {
return static_cast<InsetOptArg *>(ins);
}
return 0;
}
-} // end namespace
-
ParagraphList::iterator
TeXOnePar(Buffer const * buf,
- BufferParams const & bparams,
+ ParagraphList const & paragraphs,
ParagraphList::iterator pit,
ostream & os, TexRow & texrow,
- bool moving_arg)
+ LatexRunParams const & runparams,
+ string const & everypar)
{
- lyxerr[Debug::LATEX] << "TeXOnePar... " << &*pit << endl;
+ lyxerr[Debug::LATEX] << "TeXOnePar... " << &*pit << " '" << everypar
+<< "'" << endl;
+ BufferParams const & bparams = buf->params;
+
Inset const * in = pit->inInset();
bool further_blank_line = false;
LyXLayout_ptr style;
}
if (!pit->params().spacing().isDefault()
- && (!pit->previous() || !pit->previous()->hasSameLayout(&*pit))) {
+ && (pit == const_cast<ParagraphList&>(paragraphs).begin() || !boost::prior(pit)->hasSameLayout(*pit))) {
os << pit->params().spacing().writeEnvirBegin() << '\n';
texrow.newline();
}
}
if (pit->params().lineTop()) {
- os << "\\lyxline{\\" << pit->getFont(bparams, 0).latexSize() << '}'
+ os << "\\lyxline{\\"
+ << pit->getFont(bparams, 0, outerFont(pit, paragraphs)).latexSize()
+ << '}'
<< "\\vspace{-1\\parskip}";
further_blank_line = true;
}
Language const * language = pit->getParLanguage(bparams);
Language const * doc_language = bparams.language;
- Language const * previous_language = pit->previous()
- ? pit->previous()->getParLanguage(bparams) : doc_language;
+ Language const * previous_language =
+ (pit != const_cast<ParagraphList&>(paragraphs).begin())
+ ? boost::prior(pit)->getParLanguage(bparams)
+ : doc_language;
if (language->babel() != previous_language->babel()
// check if we already put language command in TeXEnvironment()
&& !(style->isEnvironment()
- && (!pit->previous() ||
- (pit->previous()->layout() != pit->layout() &&
- pit->previous()->getDepth() <= pit->getDepth())
- || pit->previous()->getDepth() < pit->getDepth())))
+ && (pit == const_cast<ParagraphList&>(paragraphs).begin() ||
+ (boost::prior(pit)->layout() != pit->layout() &&
+ boost::prior(pit)->getDepth() <= pit->getDepth())
+ || boost::prior(pit)->getDepth() < pit->getDepth())))
{
if (!lyxrc.language_command_end.empty() &&
previous_language->babel() != doc_language->babel())
if (style->optionalargs == 1) {
InsetOptArg * it = optArgInset(*pit);
if (it)
- it->latexOptional(buf, os, false, false);
+ it->latexOptional(buf, os, runparams);
}
else
os << style->latexparam();
break;
}
- bool need_par = pit->simpleTeXOnePar(buf, bparams, os, texrow, moving_arg);
+ os << everypar;
+ bool need_par = pit->simpleTeXOnePar(buf, bparams,
+ outerFont(pit, paragraphs),
+ os, texrow, runparams);
// Make sure that \\par is done with the font of the last
// character if this has another size as the default.
// Is this really needed ? (Dekel)
// We do not need to use to change the font for the last paragraph
// or for a command.
+ LyXFont const outerfont(outerFont(pit, paragraphs));
+
LyXFont const font =
(pit->empty()
- ? pit->getLayoutFont(bparams) : pit->getFont(bparams, pit->size() - 1));
+ ? pit->getLayoutFont(bparams, outerfont)
+ : pit->getFont(bparams, pit->size() - 1, outerfont));
bool is_command = style->isCommand();
- if (style->resfont.size() != font.size() && pit->next() && !is_command) {
+ if (style->resfont.size() != font.size()
+ && boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()
+ && !is_command) {
if (!need_par)
os << '{';
os << "\\" << font.latexSize() << " \\par}";
switch (style->latextype) {
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
- if (pit->next() && (pit->params().depth() < pit->next()->params().depth())) {
+ if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()
+ && (pit->params().depth() < boost::next(pit)->params().depth())) {
os << '\n';
texrow.newline();
}
break;
- case LATEX_ENVIRONMENT:
+ case LATEX_ENVIRONMENT: {
// if its the last paragraph of the current environment
// skip it otherwise fall through
- if (pit->next()
- && (pit->next()->layout() != pit->layout()
- || pit->next()->params().depth() != pit->params().depth()))
+ ParagraphList::iterator next = boost::next(pit);
+
+ if (next != const_cast<ParagraphList&>(paragraphs).end()
+ && (next->layout() != pit->layout()
+ || next->params().depth() != pit->params().depth()))
break;
+ }
+
// fall through possible
default:
// we don't need it for the last paragraph!!!
- if (pit->next()) {
+ if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()) {
os << '\n';
texrow.newline();
}
}
if (!pit->params().spacing().isDefault()
- && (!pit->next() || !pit->next()->hasSameLayout(&*pit))) {
+ && (boost::next(pit) == const_cast<ParagraphList&>(paragraphs).end()|| !boost::next(pit)->hasSameLayout(*pit))) {
os << pit->params().spacing().writeEnvirEnd() << '\n';
texrow.newline();
}
}
// we don't need it for the last paragraph!!!
- if (pit->next()) {
+ if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()) {
os << '\n';
texrow.newline();
} else {
}
}
- lyxerr[Debug::LATEX] << "TeXOnePar...done " << pit->next() << endl;
+ lyxerr[Debug::LATEX] << "TeXOnePar...done " << &*boost::next(pit) << endl;
return ++pit;
}
+
+} // anon namespace
+
+
+//
+// LaTeX all paragraphs from par to endpar, if endpar == 0 then to the end
+//
+void latexParagraphs(Buffer const * buf,
+ ParagraphList const & paragraphs,
+ ostream & os,
+ TexRow & texrow,
+ LatexRunParams const & runparams,
+ string const & everypar)
+{
+ bool was_title = false;
+ bool already_title = false;
+ LyXTextClass const & tclass = buf->params.getLyXTextClass();
+ ParagraphList::iterator par = const_cast<ParagraphList&>(paragraphs).begin();
+ ParagraphList::iterator endpar = const_cast<ParagraphList&>(paragraphs).end();
+
+ // if only_body
+ while (par != endpar) {
+ Inset * in = par->inInset();
+ // well we have to check if we are in an inset with unlimited
+ // length (all in one row) if that is true then we don't allow
+ // any special options in the paragraph and also we don't allow
+ // any environment other then "Standard" to be valid!
+ if ((in == 0) || !in->forceDefaultParagraphs(in)) {
+ LyXLayout_ptr const & layout = par->layout();
+
+ if (layout->intitle) {
+ if (already_title) {
+ lyxerr <<"Error in latexParagraphs: You"
+ " should not mix title layouts"
+ " with normal ones." << endl;
+ } else if (!was_title) {
+ was_title = true;
+ if (tclass.titletype() == TITLE_ENVIRONMENT) {
+ os << "\\begin{"
+ << tclass.titlename()
+ << "}\n";
+ texrow.newline();
+ }
+ }
+ } else if (was_title && !already_title) {
+ if (tclass.titletype() == TITLE_ENVIRONMENT) {
+ os << "\\end{" << tclass.titlename()
+ << "}\n";
+ }
+ else {
+ os << "\\" << tclass.titlename()
+ << "\n";
+ }
+ texrow.newline();
+ already_title = true;
+ was_title = false;
+ }
+
+ if (layout->is_environment) {
+ par = TeXOnePar(buf, paragraphs, par, os, texrow,
+ runparams, everypar);
+ } else if (layout->isEnvironment() ||
+ !par->params().leftIndent().zero())
+ {
+ par = TeXEnvironment(buf, paragraphs, par, os,
+ texrow, runparams);
+ } else {
+ par = TeXOnePar(buf, paragraphs, par, os, texrow,
+ runparams, everypar);
+ }
+ } else {
+ par = TeXOnePar(buf, paragraphs, par, os, texrow,
+ runparams, everypar);
+ }
+ }
+ // It might be that we only have a title in this document
+ if (was_title && !already_title) {
+ if (tclass.titletype() == TITLE_ENVIRONMENT) {
+ os << "\\end{" << tclass.titlename()
+ << "}\n";
+ }
+ else {
+ os << "\\" << tclass.titlename()
+ << "\n";
+ }
+ texrow.newline();
+ }
+}
+
+
+namespace {
+
+int readParToken(Buffer & buf, Paragraph & par, LyXLex & lex, string const & token)
+{
+ static LyXFont font;
+ static Change change;
+
+ BufferParams const & bp = buf.params;
+
+ if (token[0] != '\\') {
+ string::const_iterator cit = token.begin();
+ for (; cit != token.end(); ++cit) {
+ par.insertChar(par.size(), (*cit), font, change);
+ }
+ } else if (token == "\\layout") {
+ lex.eatLine();
+ string layoutname = lex.getString();
+
+ font = LyXFont(LyXFont::ALL_INHERIT, bp.language);
+ change = Change();
+
+ LyXTextClass const & tclass = bp.getLyXTextClass();
+
+ if (layoutname.empty()) {
+ layoutname = tclass.defaultLayoutName();
+ }
+
+ bool hasLayout = tclass.hasLayout(layoutname);
+
+ if (!hasLayout) {
+ lyxerr << "Layout '" << layoutname << "' does not"
+ << " exist in textclass '" << tclass.name()
+ << "'." << endl;
+ lyxerr << "Trying to use default layout instead."
+ << endl;
+ layoutname = tclass.defaultLayoutName();
+ }
+
+#ifdef USE_CAPTION
+ // The is the compability reading of layout caption.
+ if (compare_ascii_no_case(layoutname, "caption") == 0) {
+ // We expect that the par we are now working on is
+ // really inside a InsetText inside a InsetFloat.
+ // We also know that captions can only be
+ // one paragraph. (Lgb)
+
+ // We should now read until the next "\layout"
+ // is reached.
+ // This is probably not good enough, what if the
+ // caption is the last par in the document (Lgb)
+ istream & ist = lex.getStream();
+ stringstream ss;
+ string line;
+ int begin = 0;
+ while (true) {
+ getline(ist, line);
+ if (prefixIs(line, "\\layout")) {
+ lex.pushToken(line);
+ break;
+ }
+ if (prefixIs(line, "\\begin_inset"))
+ ++begin;
+ if (prefixIs(line, "\\end_inset")) {
+ if (begin)
+ --begin;
+ else {
+ lex.pushToken(line);
+ break;
+ }
+ }
+
+ ss << line << '\n';
+ }
+
+ // Now we should have the whole layout in ss
+ // we should now be able to give this to the
+ // caption inset.
+ ss << "\\end_inset\n";
+
+ // This seems like a bug in stringstream.
+ // We really should be able to use ss
+ // directly. (Lgb)
+ istringstream is(ss.str());
+ LyXLex tmplex(0, 0);
+ tmplex.setStream(is);
+ Inset * inset = new InsetCaption;
+ inset->Read(this, tmplex);
+ par.insertInset(pos, inset, font);
+ ++pos;
+ } else {
+#endif
+ par.layout(bp.getLyXTextClass()[layoutname]);
+
+ // Test whether the layout is obsolete.
+ LyXLayout_ptr const & layout = par.layout();
+ if (!layout->obsoleted_by().empty())
+ par.layout(bp.getLyXTextClass()[layout->obsoleted_by()]);
+
+ par.params().read(lex);
+#if USE_CAPTION
+ }
+#endif
+
+ } else if (token == "\\end_inset") {
+ lyxerr << "Solitary \\end_inset in line " << lex.getLineNo() << "\n"
+ << "Missing \\begin_inset?.\n";
+ // Simply ignore this. The insets do not have
+ // to read this.
+ // But insets should read it, it is a part of
+ // the inset isn't it? Lgb.
+ } else if (token == "\\begin_inset") {
+ Inset * i = readInset(lex, buf);
+ par.insertInset(par.size(), i, font, change);
+ } else if (token == "\\family") {
+ lex.next();
+ font.setLyXFamily(lex.getString());
+ } else if (token == "\\series") {
+ lex.next();
+ font.setLyXSeries(lex.getString());
+ } else if (token == "\\shape") {
+ lex.next();
+ font.setLyXShape(lex.getString());
+ } else if (token == "\\size") {
+ lex.next();
+ font.setLyXSize(lex.getString());
+ } else if (token == "\\lang") {
+ lex.next();
+ string const tok = lex.getString();
+ Language const * lang = languages.getLanguage(tok);
+ if (lang) {
+ font.setLanguage(lang);
+ } else {
+ font.setLanguage(bp.language);
+ lex.printError("Unknown language `$$Token'");
+ }
+ } else if (token == "\\numeric") {
+ lex.next();
+ font.setNumber(font.setLyXMisc(lex.getString()));
+ } else if (token == "\\emph") {
+ lex.next();
+ font.setEmph(font.setLyXMisc(lex.getString()));
+ } else if (token == "\\bar") {
+ lex.next();
+ string const tok = lex.getString();
+
+ if (tok == "under")
+ font.setUnderbar(LyXFont::ON);
+ else if (tok == "no")
+ font.setUnderbar(LyXFont::OFF);
+ else if (tok == "default")
+ font.setUnderbar(LyXFont::INHERIT);
+ else
+ lex.printError("Unknown bar font flag "
+ "`$$Token'");
+ } else if (token == "\\noun") {
+ lex.next();
+ font.setNoun(font.setLyXMisc(lex.getString()));
+ } else if (token == "\\color") {
+ lex.next();
+ font.setLyXColor(lex.getString());
+ } else if (token == "\\InsetSpace" || token == "\\SpecialChar") {
+
+ // Insets don't make sense in a free-spacing context! ---Kayvan
+ if (par.isFreeSpacing()) {
+ if (token == "\\InsetSpace")
+ par.insertChar(par.size(), ' ', font, change);
+ else if (lex.isOK()) {
+ lex.next();
+ string const next_token = lex.getString();
+ if (next_token == "\\-")
+ par.insertChar(par.size(), '-', font, change);
+ else {
+ lex.printError("Token `$$Token' "
+ "is in free space "
+ "paragraph layout!");
+ }
+ }
+ } else {
+ Inset * inset = 0;
+ if (token == "\\SpecialChar" )
+ inset = new InsetSpecialChar;
+ else
+ inset = new InsetSpace;
+ inset->read(&buf, lex);
+ par.insertInset(par.size(), inset, font, change);
+ }
+ } else if (token == "\\i") {
+ Inset * inset = new InsetLatexAccent;
+ inset->read(&buf, lex);
+ par.insertInset(par.size(), inset, font, change);
+ } else if (token == "\\backslash") {
+ par.insertChar(par.size(), '\\', font, change);
+ } else if (token == "\\newline") {
+ Inset * inset = new InsetNewline;
+ inset->read(&buf, lex);
+ par.insertInset(par.size(), inset, font, change);
+ } else if (token == "\\LyXTable") {
+ Inset * inset = new InsetTabular(buf);
+ inset->read(&buf, lex);
+ par.insertInset(par.size(), inset, font, change);
+ } else if (token == "\\bibitem") {
+ InsetCommandParams p("bibitem", "dummy");
+ InsetBibitem * inset = new InsetBibitem(p);
+ inset->read(&buf, lex);
+ par.insertInset(par.size(), inset, font, change);
+ } else if (token == "\\hfill") {
+ par.insertInset(par.size(), new InsetHFill(), font, change);
+ } else if (token == "\\change_unchanged") {
+ // Hack ! Needed for empty paragraphs :/
+ // FIXME: is it still ??
+ if (!par.size())
+ par.cleanChanges();
+ change = Change(Change::UNCHANGED);
+ } else if (token == "\\change_inserted") {
+ lex.nextToken();
+ istringstream is(STRCONV(lex.getString()));
+ int aid;
+ lyx::time_type ct;
+ is >> aid >> ct;
+ change = Change(Change::INSERTED, bp.author_map[aid], ct);
+ } else if (token == "\\change_deleted") {
+ lex.nextToken();
+ istringstream is(STRCONV(lex.getString()));
+ int aid;
+ lyx::time_type ct;
+ is >> aid >> ct;
+ change = Change(Change::DELETED, bp.author_map[aid], ct);
+ } else {
+ lex.eatLine();
+ string const s = bformat(_("Unknown token: %1$s %2$s\n"),
+ token, lex.getString());
+
+ buf.parseError(ErrorItem(_("Unknown token"), s,
+ par.id(), 0, par.size()));
+ return 1;
+ }
+ return 0;
+}
+
+}
+
+
+int readParagraph(Buffer & buf, Paragraph & par, LyXLex & lex)
+{
+ int unknown = 0;
+
+ lex.nextToken();
+ string token = lex.getString();
+
+ while (lex.isOK()) {
+
+ unknown += readParToken(buf, par, lex, token);
+
+ lex.nextToken();
+ token = lex.getString();
+
+ if (token.empty())
+ continue;
+
+ lyxerr[Debug::PARSER] << "Handling paragraph token: `"
+ << token << '\'' << endl;
+
+ // reached the next paragraph. FIXME: really we should
+ // change the file format to indicate the end of a par
+ // clearly, but for now, this hack will do
+ if (token == "\\layout" || token == "\\the_end"
+ || token == "\\end_inset" || token == "\\begin_deeper"
+ || token == "\\end_deeper") {
+ lex.pushToken(token);
+ break;
+ }
+ }
+
+ return unknown;
+}
+
+
+LyXFont const outerFont(ParagraphList::iterator pit,
+ ParagraphList const & plist)
+{
+ Paragraph::depth_type par_depth = pit->getDepth();
+ LyXFont tmpfont(LyXFont::ALL_INHERIT);
+
+ // Resolve against environment font information
+ while (pit != const_cast<ParagraphList&>(plist).end() &&
+ par_depth && !tmpfont.resolved()) {
+ pit = outerHook(pit, plist);
+ if (pit != const_cast<ParagraphList&>(plist).end()) {
+ tmpfont.realize(pit->layout()->font);
+ par_depth = pit->getDepth();
+ }
+ }
+
+ return tmpfont;
+}
+
+
+LyXFont const realizeFont(LyXFont const & font,
+ BufferParams const & params)
+{
+ LyXTextClass const & tclass = params.getLyXTextClass();
+ LyXFont tmpfont(font);
+ tmpfont.realize(tclass.defaultfont());
+ return tmpfont;
+}