#include "encoding.h"
#include "lyxrc.h"
#include "debug.h"
+#include "lyxtextclasslist.h"
+
#include "support/LAssert.h"
using lyx::pos_type;
+using std::endl;
+using std::ostream;
+using std::upper_bound;
+using std::lower_bound;
extern int tex_code_break_column;
// Update the font table.
FontTable search_font(pos, LyXFont());
- for (FontList::iterator it = std::lower_bound(fontlist.begin(),
+ for (FontList::iterator it = lower_bound(fontlist.begin(),
fontlist.end(),
search_font, matchFT());
it != fontlist.end(); ++it)
// Update the inset table.
InsetTable search_inset(pos, 0);
- for (InsetList::iterator it = std::lower_bound(owner_->insetlist.begin(),
+ for (InsetList::iterator it = lower_bound(owner_->insetlist.begin(),
owner_->insetlist.end(),
search_inset, matchIT());
it != owner_->insetlist.end(); ++it)
// Add a new entry in the inset table.
InsetTable search_inset(pos, 0);
- InsetList::iterator it = std::lower_bound(owner_->insetlist.begin(),
+ InsetList::iterator it = lower_bound(owner_->insetlist.begin(),
owner_->insetlist.end(),
search_inset, matchIT());
if (it != owner_->insetlist.end() && it->pos == pos) {
lyxerr << "ERROR (Paragraph::InsertInset): "
- "there is an inset in position: " << pos << std::endl;
+ "there is an inset in position: " << pos << endl;
} else {
owner_->insetlist.insert(it, InsetTable(pos, inset));
+ inset->parOwner(owner_);
}
if (inset_owner)
// find the entry
InsetTable search_inset(pos, 0);
InsetList::iterator it =
- std::lower_bound(owner_->insetlist.begin(),
+ lower_bound(owner_->insetlist.begin(),
owner_->insetlist.end(),
search_inset, matchIT());
if (it != owner_->insetlist.end() && it->pos == pos) {
FontTable search_font(pos, LyXFont());
FontList::iterator it =
- std::lower_bound(fontlist.begin(),
+ lower_bound(fontlist.begin(),
fontlist.end(),
search_font, matchFT());
if (it != fontlist.end() && it->pos() == pos &&
InsetTable search_inset(pos, 0);
InsetList::iterator lend = owner_->insetlist.end();
for (InsetList::iterator it =
- std::upper_bound(owner_->insetlist.begin(),
+ upper_bound(owner_->insetlist.begin(),
lend,
search_inset, matchIT());
it != lend; ++it)
}
-void Paragraph::Pimpl::simpleTeXBlanks(std::ostream & os, TexRow & texrow,
- pos_type const i,
- int & column, LyXFont const & font,
- LyXLayout const & style)
+void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
+ pos_type const i,
+ int & column, LyXFont const & font,
+ LyXLayout const & style)
{
if (style.pass_thru) return;
if (column > tex_code_break_column
&& (i < size() - 1)
// same in FreeSpacing mode
&& !style.free_spacing
+ && !owner_->isFreeSpacing()
// In typewriter mode, we want to avoid
// ! . ? : at the end of a line
&& !(font.family() == LyXFont::TYPEWRITER_FAMILY
}
-bool Paragraph::Pimpl::isTextAt(BufferParams const & bp, LyXFont & font,
+bool Paragraph::Pimpl::isTextAt(BufferParams const & bp,
string const & str, pos_type pos)
{
+ LyXFont const & font = owner_->getFont(bp, pos);
+
for (string::size_type i = 0; i < str.length(); ++i) {
if (pos + static_cast<pos_type>(i) >= size())
return false;
void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
BufferParams const & bparams,
- std::ostream & os,
+ ostream & os,
TexRow & texrow,
bool moving_arg,
LyXFont & font,
}
int tmp = inset->latex(buf, os, moving_arg,
- style.free_spacing);
+ style.free_spacing);
if (close)
os << "}";
size_t pnr = 0;
for (; pnr < phrases_nr; ++pnr) {
- if (isTextAt(bparams, font, special_phrases[pnr][0], i)) {
+ if (isTextAt(bparams, special_phrases[pnr][0], i)) {
os << special_phrases[pnr][1];
i += special_phrases[pnr][0].length() - 1;
column += special_phrases[pnr][1].length() - 1;
Paragraph * Paragraph::Pimpl::TeXDeeper(Buffer const * buf,
BufferParams const & bparams,
- std::ostream & os, TexRow & texrow)
+ ostream & os, TexRow & texrow)
{
- lyxerr[Debug::LATEX] << "TeXDeeper... " << this << std::endl;
+ lyxerr[Debug::LATEX] << "TeXDeeper... " << this << endl;
Paragraph * par = owner_;
while (par && par->params().depth() == owner_->params().depth()) {
- if (textclasslist.Style(bparams.textclass,
- par->layout).isEnvironment()) {
+ if (textclasslist[bparams.textclass][par->layout()].isEnvironment()) {
par = par->TeXEnvironment(buf, bparams,
os, texrow);
} else {
os, texrow, false);
}
}
- lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << std::endl;
+ lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
return par;
}
// check for environment font information
char par_depth = owner_->getDepth();
Paragraph const * par = owner_;
+ LyXTextClass const & tclass = textclasslist[bparams.textclass];
+
while (par && par->getDepth() && !tmpfont.resolved()) {
par = par->outerHook();
if (par) {
- tmpfont.realize(textclasslist.
- Style(bparams.textclass,
- par->getLayout()).font
+ tmpfont.realize(tclass[par->layout()].font
#ifdef INHERIT_LANGUAGE
, bparams.language
#endif
}
}
- tmpfont.realize(textclasslist.TextClass(bparams.textclass)
- .defaultfont()
+ tmpfont.realize(tclass.defaultfont()
#ifdef INHERIT_LANGUAGE
, bparams.language
#endif