#include "insets/insetoptarg.h"
#include "support/lstrings.h"
-#include "support/std_sstream.h"
#include "support/textutils.h"
#include "support/tostr.h"
#include <list>
#include <stack>
+#include <sstream>
using lyx::pos_type;
if (dth != params().depth()) {
if (params().depth() > dth) {
while (params().depth() > dth) {
- os << "\n\\begin_deeper ";
+ os << "\n\\begin_deeper";
++dth;
}
} else {
while (params().depth() < dth) {
- os << "\n\\end_deeper ";
+ os << "\n\\end_deeper";
--dth;
}
}
} else {
os << "\n\\begin_inset ";
inset->write(buf, os);
- os << "\n\\end_inset \n\n";
+ os << "\n\\end_inset\n\n";
column = 0;
}
}
break;
case '\\':
- os << "\n\\backslash \n";
+ os << "\n\\backslash\n";
column = 0;
break;
case '.':
}
-void Paragraph::insertChar(pos_type pos, Paragraph::value_type c)
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
+ Change change)
{
- insertChar(pos, c, LyXFont(LyXFont::ALL_INHERIT));
+ pimpl_->insertChar(pos, c, change);
}
void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
LyXFont const & font, Change change)
{
- pimpl_->insertChar(pos, c, font, change);
+ pimpl_->insertChar(pos, c, change);
+ setFont(pos, font);
}
-void Paragraph::insertInset(pos_type pos, InsetBase * inset)
+void Paragraph::insertInset(pos_type pos, InsetBase * inset, Change change)
{
- insertInset(pos, inset, LyXFont(LyXFont::ALL_INHERIT));
+ pimpl_->insertInset(pos, inset, change);
}
void Paragraph::insertInset(pos_type pos, InsetBase * inset,
- LyXFont const & font, Change change)
+ LyXFont const & font, Change change)
{
- pimpl_->insertInset(pos, inset, font, change);
+ pimpl_->insertInset(pos, inset, change);
+ setFont(pos, font);
}
case LYX_ALIGN_CENTER:
if (moving_arg) {
os << "\\protect";
- column = 8;
+ column += 8;
}
break;
}
BufferParams const & bparams,
LyXFont const & outerfont,
ostream & os, TexRow & texrow,
- OutputParams const & runparams)
+ OutputParams const & runparams) const
{
lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl;
unsigned int column = 0;
if (body_pos > 0) {
- os << '[';
- ++column;
+ // the optional argument is kept in curly brackets in
+ // case it contains a ']'
+ os << "[{";
+ column += 2;
basefont = getLabelFont(bparams, outerfont);
} else {
basefont = getLayoutFont(bparams, outerfont);
}
- bool moving_arg = runparams.moving_arg;
- moving_arg |= style->needprotect;
+ bool const moving_arg = runparams.moving_arg | style->needprotect;
// Which font is currently active?
LyXFont running_font(basefont);
}
basefont = getLayoutFont(bparams, outerfont);
running_font = basefont;
- os << ']';
- ++column;
+ os << "}] ";
+ column +=3;
}
if (style->isCommand()) {
os << '{';
OutputParams rp = runparams;
rp.moving_arg = moving_arg;
rp.free_spacing = style->free_spacing;
+ rp.local_language = font.language()->babel();
+ rp.intitle = style->intitle;
pimpl_->simpleTeXSpecialChars(buf, bparams,
- os, texrow, runparams,
+ os, texrow, rp,
font, running_font,
basefont, outerfont, open_font,
running_change,
bool Paragraph::isHfill(pos_type pos) const
{
- return
- isInset(pos) && getInset(pos)->lyxCode() == InsetBase::HFILL_CODE;
+ return isInset(pos)
+ && getInset(pos)->lyxCode() == InsetBase::HFILL_CODE;
}
bool Paragraph::isNewline(pos_type pos) const
{
- return
- isInset(pos) && getInset(pos)->lyxCode() == InsetBase::NEWLINE_CODE;
+ return isInset(pos)
+ && getInset(pos)->lyxCode() == InsetBase::NEWLINE_CODE;
}
bool Paragraph::isWord(pos_type pos) const
{
- unsigned char const c = getChar(pos);
+ if (isInset(pos))
+ return getInset(pos)->isLetter();
+ value_type const c = getChar(pos);
return !(IsSeparatorChar(c)
|| IsKommaChar(c)
|| IsInsetChar(c));
}
-Paragraph::value_type Paragraph::getChar(pos_type pos) const
-{
- // This is in the critical path!
- pos_type const siz = text_.size();
-
- BOOST_ASSERT(0 <= pos);
- BOOST_ASSERT(pos <= siz);
-
- if (pos == siz) {
- lyxerr << "getChar() on pos " << pos << " in par id "
- << id() << " of size " << siz
- << " is a bit silly !" << endl;
- BOOST_ASSERT(false);
- }
-
- return text_[pos];
-}
-
-
int Paragraph::id() const
{
return pimpl_->id_;