#include "buffer.h"
#include "bufferparams.h"
+#include "counters.h"
#include "encoding.h"
#include "debug.h"
#include "gettext.h"
#include "language.h"
-#include "latexrunparams.h"
#include "lyxfont.h"
#include "lyxrc.h"
#include "lyxrow.h"
+#include "outputparams.h"
#include "paragraph_funcs.h"
+#include "ParagraphList_fwd.h"
#include "sgml.h"
#include "texrow.h"
#include "vspace.h"
#include "support/lstrings.h"
#include "support/textutils.h"
-#include "support/std_sstream.h"
+#include "support/tostr.h"
#include <boost/tuple/tuple.hpp>
+#include <boost/bind.hpp>
#include <list>
#include <stack>
+#include <sstream>
using lyx::pos_type;
using lyx::support::contains;
using lyx::support::subst;
+using std::distance;
using std::endl;
using std::list;
using std::stack;
using std::ostringstream;
+ParagraphList::ParagraphList()
+{}
+
+
Paragraph::Paragraph()
- : y(0), height(0), pimpl_(new Paragraph::Pimpl(this))
+ : y(0), height(0), begin_of_body_(0),
+ pimpl_(new Paragraph::Pimpl(this))
{
+ //lyxerr << "sizeof Paragraph::Pimpl: " << sizeof(Paragraph::Pimpl) << endl;
itemdepth = 0;
params().clear();
}
-Paragraph::Paragraph(Paragraph const & lp)
- : y(0), height(0), text_(lp.text_), pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this))
+Paragraph::Paragraph(Paragraph const & par)
+ : itemdepth(par.itemdepth), insetlist(par.insetlist),
+ rows(par.rows), y(par.y), height(par.height),
+ width(par.width), layout_(par.layout_),
+ text_(par.text_), begin_of_body_(par.begin_of_body_),
+ pimpl_(new Paragraph::Pimpl(*par.pimpl_, this))
{
- itemdepth = 0;
- // this is because of the dummy layout of the paragraphs that
- // follow footnotes
- layout_ = lp.layout();
-
- // copy everything behind the break-position to the new paragraph
- insetlist = lp.insetlist;
+ //lyxerr << "Paragraph::Paragraph(Paragraph const&)" << endl;
InsetList::iterator it = insetlist.begin();
InsetList::iterator end = insetlist.end();
- for (; it != end; ++it) {
- // currently we hold Inset*, not InsetBase*
- it->inset = static_cast<InsetOld*>(it->inset->clone().release());
- }
+ for (; it != end; ++it)
+ it->inset = it->inset->clone().release();
}
-void Paragraph::operator=(Paragraph const & lp)
+Paragraph & Paragraph::operator=(Paragraph const & par)
{
// needed as we will destroy the pimpl_ before copying it
- if (&lp != this)
- return;
-
- lyxerr << "Paragraph::operator=()" << endl;
-
- text_ = lp.text_;
-
- delete pimpl_;
- pimpl_ = new Pimpl(*lp.pimpl_, this);
-
- itemdepth = lp.itemdepth;
- // this is because of the dummy layout of the paragraphs that
- // follow footnotes
- layout_ = lp.layout();
-
- // copy everything behind the break-position to the new paragraph
- insetlist = lp.insetlist;
- InsetList::iterator it = insetlist.begin();
- InsetList::iterator end = insetlist.end();
- for (; it != end; ++it) {
- it->inset = static_cast<InsetOld*>(it->inset->clone().release());
+ if (&par != this) {
+ itemdepth = par.itemdepth;
+
+ insetlist = par.insetlist;
+ InsetList::iterator it = insetlist.begin();
+ InsetList::iterator end = insetlist.end();
+ for (; it != end; ++it)
+ it->inset = it->inset->clone().release();
+
+ rows = par.rows;
+ y = par.y;
+ height = par.height;
+ width = par.width;
+ layout_ = par.layout();
+ text_ = par.text_;
+ begin_of_body_ = par.begin_of_body_;
+
+ delete pimpl_;
+ pimpl_ = new Pimpl(*par.pimpl_, this);
}
+ return *this;
}
-// the destructor removes the new paragraph from the list
+
Paragraph::~Paragraph()
{
delete pimpl_;
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;
}
}
switch (c) {
case META_INSET:
{
- InsetOld const * inset = getInset(i);
+ InsetBase const * inset = getInset(i);
if (inset)
if (inset->directWrite()) {
// international char, let it write
} 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 '.':
}
-bool Paragraph::checkInsertChar(LyXFont & font)
+bool Paragraph::checkInsertChar(LyXFont &)
{
- if (pimpl_->inset_owner)
- return pimpl_->inset_owner->checkInsertChar(font);
return true;
}
-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, InsetOld * 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, InsetOld * inset,
- LyXFont const & font, Change change)
+void Paragraph::insertInset(pos_type pos, InsetBase * inset,
+ LyXFont const & font, Change change)
{
- pimpl_->insertInset(pos, inset, font, change);
+ pimpl_->insertInset(pos, inset, change);
+ setFont(pos, font);
}
bool Paragraph::insetAllowed(InsetOld_code code)
{
- //lyxerr << "Paragraph::InsertInsetAllowed" << endl;
- if (pimpl_->inset_owner)
- return pimpl_->inset_owner->insetAllowed(code);
- return true;
+ return !pimpl_->inset_owner || pimpl_->inset_owner->insetAllowed(code);
}
-InsetOld * Paragraph::getInset(pos_type pos)
+InsetBase * Paragraph::getInset(pos_type pos)
{
BOOST_ASSERT(pos < size());
return insetlist.get(pos);
}
-InsetOld const * Paragraph::getInset(pos_type pos) const
+InsetBase const * Paragraph::getInset(pos_type pos) const
{
BOOST_ASSERT(pos < size());
return insetlist.get(pos);
LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
pos_type pos) const
{
- BOOST_ASSERT(pos <= size());
+ if (pos > size()) {
+ lyxerr << " pos: " << pos << " size: " << size() << endl;
+ BOOST_ASSERT(pos <= size());
+ }
Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
LyXLayout_ptr const & lout = layout();
- pos_type const body_pos = beginningOfBody();
+ pos_type const body_pos = beginOfBody();
LyXFont layoutfont;
if (pos < body_pos)
if (it->pos() >= pos)
break;
}
- unsigned int i = std::distance(beg, it);
+ unsigned int i = distance(beg, it);
bool notfound = (it == endit);
if (!notfound && pimpl_->fontlist[i].font() == font)
bool Paragraph::hasSameLayout(Paragraph const & par) const
{
- return
- par.layout() == layout() &&
- params().sameLayout(par.params());
+ return par.layout() == layout() && params().sameLayout(par.params());
}
layout(new_layout);
params().labelWidthString(string());
params().align(LYX_ALIGN_LAYOUT);
- params().spaceTop(VSpace(VSpace::NONE));
- params().spaceBottom(VSpace(VSpace::NONE));
params().spacing(Spacing(Spacing::Default));
}
-int Paragraph::beginningOfBody() const
+pos_type Paragraph::beginOfBody() const
{
- if (layout()->labeltype != LABEL_MANUAL)
- return 0;
+ return begin_of_body_;
+}
+
+
+void Paragraph::setBeginOfBody()
+{
+ if (layout()->labeltype != LABEL_MANUAL) {
+ begin_of_body_ = 0;
+ return;
+ }
// Unroll the first two cycles of the loop
// and remember the previous character to
// remove unnecessary getChar() calls
pos_type i = 0;
- if (i < size() && !isNewline(i)) {
+ pos_type end = size();
+ if (i < end && !isNewline(i)) {
++i;
char previous_char = 0;
char temp = 0;
- if (i < size()) {
- previous_char = getChar(i);
+ if (i < end) {
+ previous_char = text_[i];
if (!isNewline(i)) {
++i;
- while (i < size() && previous_char != ' ') {
- temp = getChar(i);
+ while (i < end && previous_char != ' ') {
+ temp = text_[i];
if (isNewline(i))
break;
-
++i;
previous_char = temp;
}
}
}
- return i;
+ begin_of_body_ = i;
}
// returns -1 if inset not found
-int Paragraph::getPositionOfInset(InsetOld const * inset) const
+int Paragraph::getPositionOfInset(InsetBase const * inset) const
{
// Find the entry.
InsetList::const_iterator it = insetlist.begin();
InsetBibitem * Paragraph::bibitem() const
{
- InsetList::const_iterator it = insetlist.begin();
- if (it != insetlist.end() && it->inset->lyxCode() == InsetOld::BIBTEX_CODE)
- return static_cast<InsetBibitem *>(it->inset);
+ if (!insetlist.empty()) {
+ InsetBase * inset = insetlist.begin()->inset;
+ if (inset->lyxCode() == InsetBase::BIBTEX_CODE)
+ return static_cast<InsetBibitem *>(inset);
+ }
return 0;
}
+bool Paragraph::forceDefaultParagraphs() const
+{
+ return inInset() && inInset()->forceDefaultParagraphs(inInset());
+}
+
+
+bool Paragraph::autoBreakRows() const
+{
+ return inInset() && static_cast<InsetText *>(inInset())->getAutoBreakRows();
+}
+
+
namespace {
-/* paragraphs inside floats need different alignment tags to avoid
-unwanted space */
+// paragraphs inside floats need different alignment tags to avoid
+// unwanted space
-bool noTrivlistCentering(UpdatableInset const * inset)
+bool noTrivlistCentering(InsetBase::Code code)
{
- if (inset && inset->owner()) {
- InsetOld::Code const code = inset->owner()->lyxCode();
- return code == InsetOld::FLOAT_CODE ||
- code == InsetOld::WRAP_CODE;
- }
- return false;
+ return code == InsetBase::FLOAT_CODE || code == InsetBase::WRAP_CODE;
}
string const corrected_env(string const & suffix, string const & env,
- UpdatableInset const * inset)
+ InsetBase::Code code)
{
string output = suffix + "{";
- if (noTrivlistCentering(inset))
+ if (noTrivlistCentering(code))
output += correction(env);
else
output += env;
case LYX_ALIGN_CENTER:
if (moving_arg) {
os << "\\protect";
- column = 8;
+ column += 8;
}
break;
}
break;
case LYX_ALIGN_LEFT: {
string output;
- UpdatableInset const * const inset = pimpl_->inset_owner;
if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\begin", "flushleft", inset);
+ output = corrected_env("\\begin", "flushleft", ownerCode());
else
- output = corrected_env("\\begin", "flushright", inset);
+ output = corrected_env("\\begin", "flushright", ownerCode());
os << output;
column += output.size();
break;
} case LYX_ALIGN_RIGHT: {
string output;
- UpdatableInset const * const inset = pimpl_->inset_owner;
if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\begin", "flushright", inset);
+ output = corrected_env("\\begin", "flushright", ownerCode());
else
- output = corrected_env("\\begin", "flushleft", inset);
+ output = corrected_env("\\begin", "flushleft", ownerCode());
os << output;
column += output.size();
break;
} case LYX_ALIGN_CENTER: {
string output;
- output = corrected_env("\\begin", "center", pimpl_->inset_owner);
+ output = corrected_env("\\begin", "center", ownerCode());
os << output;
column += output.size();
break;
break;
case LYX_ALIGN_LEFT: {
string output;
- UpdatableInset const * const inset = pimpl_->inset_owner;
if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\par\\end", "flushleft", inset);
+ output = corrected_env("\\par\\end", "flushleft", ownerCode());
else
- output = corrected_env("\\par\\end", "flushright", inset);
+ output = corrected_env("\\par\\end", "flushright", ownerCode());
os << output;
column += output.size();
break;
} case LYX_ALIGN_RIGHT: {
string output;
- UpdatableInset const * const inset = pimpl_->inset_owner;
if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\par\\end", "flushright", inset);
+ output = corrected_env("\\par\\end", "flushright", ownerCode());
else
- output = corrected_env("\\par\\end", "flushleft", inset);
+ output = corrected_env("\\par\\end", "flushleft", ownerCode());
os << output;
column += output.size();
break;
} case LYX_ALIGN_CENTER: {
string output;
- output = corrected_env("\\par\\end", "center", pimpl_->inset_owner);
+ output = corrected_env("\\par\\end", "center", ownerCode());
os << output;
column += output.size();
break;
BufferParams const & bparams,
LyXFont const & outerfont,
ostream & os, TexRow & texrow,
- LatexRunParams const & runparams)
+ OutputParams const & runparams) const
{
lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl;
// 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!
- bool asdefault =
- (inInset() && inInset()->forceDefaultParagraphs(inInset()));
+ bool asdefault = forceDefaultParagraphs();
if (asdefault) {
style = bparams.getLyXTextClass().defaultLayout();
LyXFont basefont;
// Maybe we have to create a optional argument.
- pos_type body_pos;
-
- // FIXME: can we actually skip this check and just call
- // beginningOfBody() ??
- if (style->labeltype != LABEL_MANUAL) {
- body_pos = 0;
- } else {
- body_pos = beginningOfBody();
- }
-
+ pos_type body_pos = beginOfBody();
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);
}
if (!asdefault)
column += startTeXParParams(bparams, os, moving_arg);
-
}
for (pos_type i = 0; i < size(); ++i) {
}
basefont = getLayoutFont(bparams, outerfont);
running_font = basefont;
- os << ']';
- ++column;
+ os << "}] ";
+ column +=3;
}
if (style->isCommand()) {
os << '{';
// rather than "\textXX{text }". (Asger)
if (open_font && c == ' ' && i <= size() - 2) {
LyXFont const & next_font = getFont(bparams, i + 1, outerfont);
- if (next_font != running_font
- && next_font != font) {
+ if (next_font != running_font && next_font != font) {
font = next_font;
}
}
column += Changes::latexMarkChange(os, running_change, change);
running_change = change;
- LatexRunParams rp = runparams;
+ 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,
}
enum PAR_TAG {
- NONE=0,
+ PAR_NONE=0,
TT = 1,
SF = 2,
BF = 4,
string tag_name(PAR_TAG const & pt) {
switch (pt) {
- case NONE: return "!-- --";
+ case PAR_NONE: return "!-- --";
case TT: return "tt";
case SF: return "sf";
case BF: return "bf";
void Paragraph::simpleLinuxDocOnePar(Buffer const & buf,
ostream & os,
LyXFont const & outerfont,
- LatexRunParams const & runparams,
+ OutputParams const & runparams,
lyx::depth_type /*depth*/) const
{
LyXLayout_ptr const & style = layout();
// parsing main loop
for (pos_type i = 0; i < size(); ++i) {
- PAR_TAG tag_close = NONE;
+ PAR_TAG tag_close = PAR_NONE;
list < PAR_TAG > tag_open;
LyXFont const font = getFont(buf.params(), i, outerfont);
char c = getChar(i);
+
if (c == Paragraph::META_INSET) {
- InsetOld const * inset = getInset(i);
- inset->linuxdoc(buf, os, runparams);
+ getInset(i)->linuxdoc(buf, os, runparams);
font_old = font;
continue;
}
if (ws && !isFreeSpacing()) {
// in freespacing mode, spaces are
// non-breaking characters
- if (desc_on) {// if char is ' ' then...
-
+ if (desc_on) { // if char is ' ' then...
++char_line_count;
sgmlLineBreak(os, char_line_count, 6);
os << "</tag>";
}
+string Paragraph::getDocbookId() const
+{
+ for (pos_type i = 0; i < size(); ++i) {
+ if (isInset(i)) {
+ InsetBase const * inset = getInset(i);
+ InsetBase::Code lyx_code = inset->lyxCode();
+ if (lyx_code == InsetBase::LABEL_CODE) {
+ return static_cast<InsetCommand const *>(inset)->getContents();
+ }
+ }
+
+ }
+ return string();
+}
+
+
void Paragraph::simpleDocBookOnePar(Buffer const & buf,
ostream & os,
LyXFont const & outerfont,
- int & desc_on,
- LatexRunParams const & runparams,
+ OutputParams const & runparams,
lyx::depth_type depth) const
{
bool emph_flag = false;
LyXLayout_ptr const & style = layout();
+ LyXLayout_ptr const & defaultstyle =
+ buf.params().getLyXTextClass().defaultLayout();
- LyXFont font_old = (style->labeltype == LABEL_MANUAL ? style->labelfont : style->font);
+ LyXFont font_old =
+ style->labeltype == LABEL_MANUAL ? style->labelfont : style->font;
int char_line_count = depth;
- //if (!style.free_spacing)
- // os << string(depth,' ');
+ bool label_closed = true;
+ bool para_closed = true;
+
+ if (style->latextype == LATEX_ITEM_ENVIRONMENT) {
+ string ls = "";
+ Counters & counters = buf.params().getLyXTextClass().counters();
+ if (!style->free_spacing)
+ os << string(depth,' ');
+ if (!style->labeltag().empty()) {
+ os << "<" << style->labeltag() << ">\n";
+ label_closed = false;
+ } else {
+ if (!defaultstyle->latexparam().empty()) {
+ counters.step("para");
+ ls = tostr(counters.value("para"));
+ ls = " id=\""
+ + subst(defaultstyle->latexparam(), "#", ls) + '"';
+ }
+ os << "<" << style->itemtag() << ">\n"
+ << string(depth, ' ') << "<"
+ << defaultstyle->latexname() << ls << ">\n";
+ para_closed = false;
+ }
+ }
// parsing main loop
for (pos_type i = 0; i < size(); ++i) {
}
}
-
if (isInset(i)) {
- InsetOld const * inset = getInset(i);
- // don't print the inset in position 0 if desc_on == 3 (label)
- if (i || desc_on != 3) {
- if (style->latexparam() == "CDATA")
- os << "]]>";
- inset->docbook(buf, os, runparams);
- if (style->latexparam() == "CDATA")
- os << "<![CDATA[";
- }
+ InsetBase const * inset = getInset(i);
+ if (style->latexparam() == "CDATA")
+ os << "]]>";
+ inset->docbook(buf, os, runparams);
+ if (style->latexparam() == "CDATA")
+ os << "<![CDATA[";
} else {
char c = getChar(i);
bool ws;
os << c;
} else if (isFreeSpacing() || c != ' ') {
os << str;
- } else if (desc_on == 1) {
+ } else if (!style->labeltag().empty() && !label_closed) {
++char_line_count;
- os << "\n</term><listitem><para>";
- desc_on = 2;
+ os << "\n</" << style->labeltag() << "><"
+ << style->itemtag() << "><"
+ << defaultstyle->latexname() << ">";
+ label_closed = true;
+ para_closed = false;
} else {
os << ' ';
}
}
// resets description flag correctly
- if (desc_on == 1) {
+ if (!label_closed) {
// <term> not closed...
- os << "</term>\n<listitem><para> </para>";
+ os << "</" << style->labeltag() << ">\n<"
+ << style->itemtag() << "><"
+ << defaultstyle->latexname() << "> ";
+ }
+ if (!para_closed) {
+ os << "\n" << string(depth, ' ') << "</"
+ << defaultstyle->latexname() << ">\n";
}
if (style->free_spacing)
os << '\n';
bool Paragraph::isHfill(pos_type pos) const
{
- return IsInsetChar(getChar(pos))
- && getInset(pos)->lyxCode() == InsetOld::HFILL_CODE;
-}
-
-
-bool Paragraph::isInset(pos_type pos) const
-{
- return IsInsetChar(getChar(pos));
+ return isInset(pos)
+ && getInset(pos)->lyxCode() == InsetBase::HFILL_CODE;
}
bool Paragraph::isNewline(pos_type pos) const
{
- return IsInsetChar(getChar(pos))
- && getInset(pos)->lyxCode() == InsetOld::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));
{
if (!empty())
return getFirstFontSettings().language();
+#ifdef WITH_WARNINGS
#warning FIXME we should check the prev par as well (Lgb)
+#endif
return bparams.language;
}
{
return lyxrc.rtl_support
&& getParLanguage(bparams)->RightToLeft()
- && !(inInset() && inInset()->owner() &&
- inInset()->owner()->lyxCode() == InsetOld::ERT_CODE);
+ && ownerCode() != InsetBase::ERT_CODE;
}
}
-bool Paragraph::isMultiLingual(BufferParams const & bparams)
+bool Paragraph::isMultiLingual(BufferParams const & bparams) const
{
Language const * doc_language = bparams.language;
Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
// Convert the paragraph to a string.
// Used for building the table of contents
-string const Paragraph::asString(Buffer const & buffer,
- bool label) const
+string const Paragraph::asString(Buffer const & buffer, bool label) const
{
- LatexRunParams runparams;
+ OutputParams runparams;
return asString(buffer, runparams, label);
}
string const Paragraph::asString(Buffer const & buffer,
- LatexRunParams const & runparams,
+ OutputParams const & runparams,
bool label) const
{
#if 0
if (IsPrintable(c))
s += c;
else if (c == META_INSET &&
- getInset(i)->lyxCode() == InsetOld::MATH_CODE) {
+ getInset(i)->lyxCode() == InsetBase::MATH_CODE) {
ostringstream os;
- getInset(i)->ascii(buffer, os, runparams);
+ getInset(i)->plaintext(buffer, os, runparams);
s += subst(STRCONV(os.str()),'\n',' ');
}
}
pos_type beg, pos_type end, bool label) const
{
- LatexRunParams const runparams;
+ OutputParams const runparams;
return asString(buffer, runparams, beg, end, label);
}
string const Paragraph::asString(Buffer const & buffer,
- LatexRunParams const & runparams,
+ OutputParams const & runparams,
pos_type beg, pos_type end, bool label) const
{
ostringstream os;
if (IsPrintable(c))
os << c;
else if (c == META_INSET)
- getInset(i)->ascii(buffer, os, runparams);
+ getInset(i)->plaintext(buffer, os, runparams);
}
return os.str();
void Paragraph::setInsetOwner(UpdatableInset * inset)
{
pimpl_->inset_owner = inset;
- InsetList::iterator it = insetlist.begin();
- InsetList::iterator end = insetlist.end();
- for (; it != end; ++it)
- if (it->inset)
- it->inset->setOwner(inset);
-}
-
-
-void Paragraph::deleteInsetsLyXText(BufferView * bv)
-{
- insetlist.deleteInsetsLyXText(bv);
}
Change::Type Paragraph::lookupChange(lyx::pos_type pos) const
{
- BOOST_ASSERT(!size() || pos < size());
+ BOOST_ASSERT(empty() || pos < size());
return pimpl_->lookupChange(pos);
}
Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const
{
- BOOST_ASSERT(!size() || pos < size());
+ BOOST_ASSERT(empty() || pos < size());
return pimpl_->lookupChangeFull(pos);
}
void Paragraph::setChange(lyx::pos_type pos, Change::Type type)
{
pimpl_->setChange(pos, type);
-
}
}
-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 '\0';
- }
-
- return text_[pos];
-}
-
-
int Paragraph::id() const
{
return pimpl_->id_;
LyXLayout_ptr const & Paragraph::layout() const
{
-/*
- InsetOld * inset = inInset();
- if (inset && inset->lyxCode() == InsetOld::ENVIRONMENT_CODE)
- return static_cast<InsetEnvironment*>(inset)->layout();
-*/
return layout_;
}
}
+InsetBase::Code Paragraph::ownerCode() const
+{
+ return pimpl_->inset_owner
+ ? pimpl_->inset_owner->lyxCode() : InsetBase::NO_CODE;
+}
+
+
void Paragraph::clearContents()
{
text_.clear();
return true;
// for now we just need this, later should we need this in some
- // other way we can always add a function to InsetOld too.
- if (pimpl_->inset_owner && pimpl_->inset_owner->owner())
- return pimpl_->inset_owner->owner()->lyxCode() == InsetOld::ERT_CODE;
- return false;
+ // other way we can always add a function to InsetBase too.
+ return ownerCode() == InsetBase::ERT_CODE;
}
{
if (layout()->keepempty)
return true;
- if (pimpl_->inset_owner && pimpl_->inset_owner->owner())
- return pimpl_->inset_owner->owner()->lyxCode() == InsetOld::ERT_CODE;
- return false;
+ return ownerCode() == InsetBase::ERT_CODE;
}
}
+RowList::const_iterator Paragraph::getRow(pos_type pos) const
+{
+ RowList::const_iterator rit = rows.end();
+ RowList::const_iterator const begin = rows.begin();
+
+ for (--rit; rit != begin && rit->pos() > pos; --rit)
+ ;
+
+ return rit;
+}
+
+
+size_t Paragraph::row(pos_type pos) const
+{
+ RowList::const_iterator rit = rows.end();
+ RowList::const_iterator const begin = rows.begin();
+
+ for (--rit; rit != begin && rit->pos() > pos; --rit)
+ ;
+
+ return rit - begin;
+}
+
+
unsigned char Paragraph::transformChar(unsigned char c, pos_type pos) const
{
if (!Encodings::is_arabic(c))