X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.C;h=a38fe6e8c6b6bc507920ba0b0732800e0a56c46f;hb=69cf3b62043861ccad5f8ad7ffb4981fe50b078d;hp=cc63b355636fac0aac11db0c7b52412fd55e2191;hpb=22909c4ae1cb3c27cf0176f192dcd5573836f011;p=lyx.git diff --git a/src/paragraph.C b/src/paragraph.C index cc63b35563..a38fe6e8c6 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -10,10 +10,6 @@ #include -#ifdef __GNUG__ -#pragma implementation -#endif - #include "paragraph.h" #include "paragraph_pimpl.h" #include "lyxrc.h" @@ -28,10 +24,10 @@ #include "encoding.h" #include "ParameterStruct.h" #include "gettext.h" +#include "changes.h" -#include "insets/insetinclude.h" #include "insets/insetbib.h" -#include "insets/insettext.h" +#include "insets/insetoptarg.h" #include "support/filetools.h" #include "support/lstrings.h" @@ -43,6 +39,7 @@ #include #include #include +#include using std::ostream; using std::endl; @@ -50,11 +47,9 @@ using std::fstream; using std::ios; using std::lower_bound; using std::upper_bound; -using std::reverse; using lyx::pos_type; -int tex_code_break_column = 72; // needs non-zero initialization. set later. // this is a bad idea, but how can Paragraph find its buffer to get // parameters? (JMarc) @@ -77,8 +72,10 @@ extern BufferView * current_view; Paragraph::Paragraph() : pimpl_(new Paragraph::Pimpl(this)) { +#ifndef NO_NEXT next_ = 0; previous_ = 0; +#endif enumdepth = 0; itemdepth = 0; bibkey = 0; // ale970302 @@ -86,6 +83,7 @@ Paragraph::Paragraph() } +#ifndef NO_NEXT // This constructor inserts the new paragraph in a list. Paragraph::Paragraph(Paragraph * par) : pimpl_(new Paragraph::Pimpl(this)) @@ -104,6 +102,7 @@ Paragraph::Paragraph(Paragraph * par) bibkey = 0; // ale970302 params().clear(); } +#endif Paragraph::Paragraph(Paragraph const & lp, bool same_ids) @@ -111,9 +110,10 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids) { enumdepth = 0; itemdepth = 0; +#ifndef NO_NEXT next_ = 0; previous_ = 0; - +#endif // this is because of the dummy layout of the paragraphs that // follow footnotes layout_ = lp.layout(); @@ -128,12 +128,13 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids) // copy everything behind the break-position to the new paragraph insetlist = lp.insetlist; - for (InsetList::iterator it = insetlist.begin(); - it != insetlist.end(); ++it) - { - it->inset = it->inset->clone(*current_view->buffer(), same_ids); + InsetList::iterator it = insetlist.begin(); + InsetList::iterator end = insetlist.end(); + for (; it != end; ++it) { + it.setInset(it.getInset()->clone(*current_view->buffer(), + same_ids)); // tell the new inset who is the boss now - it->inset->parOwner(this); + it.getInset()->parOwner(this); } } @@ -141,15 +142,12 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids) // the destructor removes the new paragraph from the list Paragraph::~Paragraph() { +#ifndef NO_NEXT if (previous_) previous_->next_ = next_; if (next_) next_->previous_ = previous_; - - for (InsetList::iterator it = insetlist.begin(); - it != insetlist.end(); ++it) { - delete it->inset; - } +#endif // ale970302 delete bibkey; @@ -161,9 +159,9 @@ Paragraph::~Paragraph() } -void Paragraph::writeFile(Buffer const * buf, ostream & os, +void Paragraph::write(Buffer const * buf, ostream & os, BufferParams const & bparams, - depth_type dth) const + depth_type & dth) const { // The beginning or end of a deeper (i.e. nested) area? if (dth != params().depth()) { @@ -181,15 +179,15 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os, } // First write the layout - os << "\n\\layout " << layout()->name() << "\n"; + os << "\n\\layout " << layout()->name() << '\n'; // Maybe some vertical spaces. if (params().spaceTop().kind() != VSpace::NONE) os << "\\added_space_top " - << params().spaceTop().asLyXCommand() << " "; + << params().spaceTop().asLyXCommand() << ' '; if (params().spaceBottom().kind() != VSpace::NONE) os << "\\added_space_bottom " - << params().spaceBottom().asLyXCommand() << " "; + << params().spaceBottom().asLyXCommand() << ' '; // Maybe the paragraph has special spacing params().spacing().writeFile(os, true); @@ -221,7 +219,8 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os, // Do we have a manual left indent? if (!params().leftIndent().zero()) - os << "\\leftindent " << params().leftIndent().asString() << " "; + os << "\\leftindent " << params().leftIndent().asString() + << ' '; // Alignment? if (params().align() != LYX_ALIGN_LAYOUT) { @@ -232,7 +231,7 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os, case LYX_ALIGN_CENTER: h = 3; break; default: h = 0; break; } - os << "\\align " << string_align[h] << " "; + os << "\\align " << string_align[h] << ' '; } // bibitem ale970302 @@ -241,21 +240,24 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os, LyXFont font1(LyXFont::ALL_INHERIT, bparams.language); + Change running_change = Change(Change::UNCHANGED); + lyx::time_type const curtime(lyx::current_time()); + int column = 0; for (pos_type i = 0; i < size(); ++i) { if (!i) { - os << "\n"; + os << '\n'; column = 0; } + Change change = pimpl_->lookupChangeFull(i); + Changes::lyxMarkChange(os, column, curtime, running_change, change); + running_change = change; + // Write font changes LyXFont font2 = getFontSettings(bparams, i); if (font2 != font1) { -#ifndef INHERIT_LANGUAGE font2.lyxWriteChanges(font1, os); -#else - font2.lyxWriteChanges(font1, bparams.language, os); -#endif column = 0; font1 = font2; } @@ -296,12 +298,12 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os, os << ".\n"; column = 0; } else - os << "."; + os << '.'; break; default: if ((column > 70 && c == ' ') || column > 79) { - os << "\n"; + os << '\n'; column = 0; } // this check is to amend a bug. LyX sometimes @@ -316,9 +318,14 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os, } } - // now write the next paragraph - if (next_) - next_->writeFile(buf, os, bparams, dth); + // to make reading work properly + if (!size()) { + running_change = pimpl_->lookupChange(0); + Changes::lyxMarkChange(os, column, curtime, + Change(Change::UNCHANGED), running_change); + } + Changes::lyxMarkChange(os, column, curtime, + running_change, Change(Change::UNCHANGED)); } @@ -355,21 +362,8 @@ void Paragraph::cutIntoMinibuffer(BufferParams const & bparams, pos_type pos) minibuffer_inset = 0; if (minibuffer_char == Paragraph::META_INSET) { if (getInset(pos)) { - minibuffer_inset = getInset(pos); - // This is a little hack since I want exactly - // the inset, not just a clone. Otherwise - // the inset would be deleted when calling Erase(pos) - // find the entry - InsetList::iterator it = insetlist.begin(); - InsetList::iterator end = insetlist.end(); - for (; it != end; ++it) { - if (it->pos == pos) - break; - } - - if (it != end && it->pos == pos) - it->inset = 0; // the inset is not in a paragraph anymore + minibuffer_inset = insetlist.release(pos); minibuffer_inset->parOwner(0); } else { minibuffer_inset = 0; @@ -409,6 +403,12 @@ void Paragraph::erase(pos_type pos) } +bool Paragraph::erase(pos_type start, pos_type end) +{ + return pimpl_->erase(start, end); +} + + bool Paragraph::checkInsertChar(LyXFont & font) { if (pimpl_->inset_owner) @@ -425,9 +425,9 @@ void Paragraph::insertChar(pos_type pos, Paragraph::value_type c) void Paragraph::insertChar(pos_type pos, Paragraph::value_type c, - LyXFont const & font) + LyXFont const & font, Change change) { - pimpl_->insertChar(pos, c, font); + pimpl_->insertChar(pos, c, font, change); } @@ -438,9 +438,9 @@ void Paragraph::insertInset(pos_type pos, Inset * inset) } -void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font) +void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font, Change change) { - pimpl_->insertInset(pos, inset, font); + pimpl_->insertInset(pos, inset, font, change); } @@ -458,27 +458,7 @@ Inset * Paragraph::getInset(pos_type pos) { lyx::Assert(pos < size()); - // Find the inset. - InsetList::iterator it = insetlist.begin(); - InsetList::iterator end = insetlist.end(); - for (; it != end; ++it) { - if (it->pos == pos) - break; - } - - if (it != end && it->pos == pos) - return it->inset; - - lyxerr << "ERROR (Paragraph::getInset): " - << "Inset does not exist: " << pos << endl; - //::raise(SIGSTOP); - - // text[pos] = ' '; // WHY!!! does this set the pos to ' '???? - // Did this commenting out introduce a bug? So far I have not - // see any, please enlighten me. (Lgb) - // My guess is that since the inset does not exist, we might - // as well replace it with a space to prevent craches. (Asger) - return 0; + return insetlist.get(pos); } @@ -486,26 +466,7 @@ Inset const * Paragraph::getInset(pos_type pos) const { lyx::Assert(pos < size()); - // Find the inset. - InsetList::const_iterator cit = insetlist.begin(); - InsetList::const_iterator end = insetlist.end(); - for (; cit != end; ++cit) { - if (cit->pos == pos) - break; - } - - if (cit != end && cit->pos == pos) - return cit->inset; - - lyxerr << "ERROR (Paragraph::getInset): " - << "Inset does not exist: " << pos << endl; - //::raise(SIGSTOP); - //text[pos] = ' '; // WHY!!! does this set the pos to ' '???? - // Did this commenting out introduce a bug? So far I have not - // see any, please enlighten me. (Lgb) - // My guess is that since the inset does not exist, we might - // as well replace it with a space to prevent craches. (Asger) - return 0; + return insetlist.get(pos); } @@ -525,14 +486,10 @@ LyXFont const Paragraph::getFontSettings(BufferParams const & bparams, LyXFont retfont; if (cit != end) { retfont = cit->font(); - } else if (pos == size() && size()) { + } else if (pos == size() && !empty()) { retfont = getFontSettings(bparams, pos - 1); } else retfont = LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams)); -#ifdef INHERIT_LANGUAGE - if (retfont.language() == inherit_language) - retfont.setLanguage(bparams.language); -#endif return retfont; } @@ -541,7 +498,7 @@ LyXFont const Paragraph::getFontSettings(BufferParams const & bparams, // Gets uninstantiated font setting at position 0 LyXFont const Paragraph::getFirstFontSettings() const { - if (size() > 0 && !pimpl_->fontlist.empty()) + if (!empty() && !pimpl_->fontlist.empty()) return pimpl_->fontlist[0].font(); return LyXFont(LyXFont::ALL_INHERIT); @@ -562,9 +519,7 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams, LyXLayout_ptr const & lout = layout(); - pos_type main_body = 0; - if (lout->labeltype == LABEL_MANUAL) - main_body = beginningOfMainBody(); + pos_type const main_body = beginningOfMainBody(); LyXFont layoutfont; if (pos < main_body) @@ -573,11 +528,7 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams, layoutfont = lout->font; LyXFont tmpfont = getFontSettings(bparams, pos); -#ifndef INHERIT_LANGUAGE tmpfont.realize(layoutfont); -#else - tmpfont.realize(layoutfont, bparams.language); -#endif return pimpl_->realizeFont(tmpfont, bparams); } @@ -717,7 +668,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font) // Merge the singleton block with the next block pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i); if (i > 0 && pimpl_->fontlist[i - 1].font() == font) - pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i-1); + pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i - 1); } else if (i > 0 && pimpl_->fontlist[i - 1].font() == font) { // Merge the singleton block with the previous block pimpl_->fontlist[i - 1].pos(pos); @@ -745,7 +696,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font) } - +#ifndef NO_NEXT void Paragraph::next(Paragraph * p) { next_ = p; @@ -783,79 +734,7 @@ Paragraph const * Paragraph::previous() const { return previous_; } - - -void Paragraph::breakParagraph(BufferParams const & bparams, - pos_type pos, - int flag) -{ - // create a new paragraph - Paragraph * tmp = new Paragraph(this); - tmp->layout(bparams.getLyXTextClass().defaultLayout()); - // remember to set the inset_owner - tmp->setInsetOwner(inInset()); - - // this is an idea for a more userfriendly layout handling, I will - // see what the users say - - // layout stays the same with latex-environments - if (flag) { - tmp->layout(layout()); - tmp->setLabelWidthString(params().labelWidthString()); - } - - bool isempty = (layout()->keepempty && !size()); - - if (!isempty && (size() > pos || !size() || flag == 2)) { - tmp->layout(layout()); - tmp->params().align(params().align()); - tmp->setLabelWidthString(params().labelWidthString()); - - tmp->params().lineBottom(params().lineBottom()); - params().lineBottom(false); - tmp->params().pagebreakBottom(params().pagebreakBottom()); - params().pagebreakBottom(false); - tmp->params().spaceBottom(params().spaceBottom()); - params().spaceBottom(VSpace(VSpace::NONE)); - - tmp->params().depth(params().depth()); - tmp->params().noindent(params().noindent()); - - // copy everything behind the break-position - // to the new paragraph - pos_type pos_end = size() - 1; - pos_type i = pos; - pos_type j = pos; - for (; i <= pos_end; ++i) { - cutIntoMinibuffer(bparams, i); - if (tmp->insertFromMinibuffer(j - pos)) - ++j; - } - for (i = pos_end; i >= pos; --i) { - erase(i); - } - } - - // just an idea of me - if (!isempty && !pos) { - tmp->params().lineTop(params().lineTop()); - tmp->params().pagebreakTop(params().pagebreakTop()); - tmp->params().spaceTop(params().spaceTop()); - tmp->bibkey = bibkey; - - bibkey = 0; - params().clear(); - - layout(bparams.getLyXTextClass().defaultLayout()); - - // layout stays the same with latex-environments - if (flag) { - layout(tmp->layout()); - setLabelWidthString(tmp->params().labelWidthString()); - params().depth(tmp->params().depth()); - } - } -} +#endif void Paragraph::makeSameLayout(Paragraph const * par) @@ -874,8 +753,8 @@ int Paragraph::stripLeadingSpaces() } int i = 0; - while (size() && (isNewline(0) || isLineSeparator(0))) { - erase(0); + while (!empty() && (isNewline(0) || isLineSeparator(0))) { + pimpl_->eraseIntern(0); ++i; } @@ -891,66 +770,6 @@ bool Paragraph::hasSameLayout(Paragraph const * par) const } -void Paragraph::breakParagraphConservative(BufferParams const & bparams, - pos_type pos) -{ - // create a new paragraph - Paragraph * tmp = new Paragraph(this); - tmp->makeSameLayout(this); - - // When can pos > Last()? - // I guess pos == Last() is possible. - if (size() > pos) { - // copy everything behind the break-position to the new - // paragraph - pos_type pos_end = size() - 1; - - //pos_type i = pos; - //pos_type j = pos; - for (pos_type i = pos, j = pos; i <= pos_end; ++i) { - cutIntoMinibuffer(bparams, i); - if (tmp->insertFromMinibuffer(j - pos)) - ++j; - } - - for (pos_type k = pos_end; k >= pos; --k) { - erase(k); - } - } -} - - -// Be carefull, this does not make any check at all. -// This method has wrong name, it combined this par with the next par. -// In that sense it is the reverse of break paragraph. (Lgb) -void Paragraph::pasteParagraph(BufferParams const & bparams) -{ - // copy the next paragraph to this one - Paragraph * the_next = next(); - - // first the DTP-stuff - params().lineBottom(the_next->params().lineBottom()); - params().spaceBottom(the_next->params().spaceBottom()); - params().pagebreakBottom(the_next->params().pagebreakBottom()); - - pos_type pos_end = the_next->pimpl_->size() - 1; - pos_type pos_insert = size(); - - // ok, now copy the paragraph - for (pos_type i = 0, j = 0; i <= pos_end; ++i) { - the_next->cutIntoMinibuffer(bparams, i); - if (insertFromMinibuffer(pos_insert + j)) - ++j; - } - - // delete the next paragraph - Paragraph * ppar = the_next->previous_; - Paragraph * npar = the_next->next_; - delete the_next; - ppar->next(npar); -} - - int Paragraph::getEndLabel() const { Paragraph const * par = this; @@ -1009,12 +828,6 @@ string const & Paragraph::getLabelstring() const } -int Paragraph::getFirstCounter(int i) const -{ - return pimpl_->counter_[i]; -} - - // the next two functions are for the manual labels string const Paragraph::getLabelWidthString() const { @@ -1051,6 +864,9 @@ void Paragraph::applyLayout(LyXLayout_ptr const & new_layout) int Paragraph::beginningOfMainBody() const { + if (layout()->labeltype != LABEL_MANUAL) + return 0; + // Unroll the first two cycles of the loop // and remember the previous character to // remove unnecessary GetChar() calls @@ -1113,6 +929,7 @@ Paragraph const * Paragraph::depthHook(depth_type depth) const return newpar; } + Paragraph * Paragraph::outerHook() { if (!getDepth()) @@ -1120,6 +937,7 @@ Paragraph * Paragraph::outerHook() return depthHook(depth_type(getDepth() - 1)); } + Paragraph const * Paragraph::outerHook() const { if (!getDepth()) @@ -1128,37 +946,40 @@ Paragraph const * Paragraph::outerHook() const } -Paragraph::inset_iterator -Paragraph::InsetIterator(pos_type pos) +// returns -1 if inset not found +int Paragraph::getPositionOfInset(Inset const * inset) const { + // Find the entry. InsetList::iterator it = insetlist.begin(); InsetList::iterator end = insetlist.end(); for (; it != end; ++it) { - if (it->pos >= pos) - break; + if (it.getInset() == inset) { + return it.getPos(); + } } + if (inset == bibkey) + return 0; - return inset_iterator(it); + return -1; } +namespace { -// returns -1 if inset not found -int Paragraph::getPositionOfInset(Inset const * inset) const +InsetOptArg * optArgInset(Paragraph const & par) { // Find the entry. - InsetList::const_iterator cit = insetlist.begin(); - InsetList::const_iterator end = insetlist.end(); - for (; cit != end; ++cit) { - if (cit->inset == inset) { - return cit->pos; + InsetList::iterator it = par.insetlist.begin(); + InsetList::iterator end = par.insetlist.end(); + for (; it != end; ++it) { + Inset * ins = it.getInset(); + if (ins->lyxCode() == Inset::OPTARG_CODE) { + return static_cast(ins); } } - if (inset == bibkey) - return 0; - - return -1; + return 0; } +} // end namespace Paragraph * Paragraph::TeXOnePar(Buffer const * buf, BufferParams const & bparams, @@ -1184,11 +1005,11 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf, if (!params().spacing().isDefault() && (!previous() || !previous()->hasSameLayout(this))) { - os << params().spacing().writeEnvirBegin() << "\n"; + os << params().spacing().writeEnvirBegin() << '\n'; texrow.newline(); } - if (tex_code_break_column && style->isCommand()) { + if (style->isCommand()) { os << '\n'; texrow.newline(); } @@ -1224,8 +1045,10 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf, if (language->babel() != previous_language->babel() // check if we already put language command in TeXEnvironment() && !(style->isEnvironment() - && (!previous() || previous()->layout() != layout() || - previous()->params().depth() != params().depth()))) + && (!previous() || + (previous()->layout() != layout() && + previous()->getDepth() <= getDepth()) + || previous()->getDepth() < getDepth()))) { if (!lyxrc.language_command_end.empty() && previous_language->babel() != doc_language->babel()) @@ -1250,15 +1073,23 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf, language->encoding() != previous_language->encoding()) { os << "\\inputencoding{" << language->encoding()->LatexName() - << "}" << endl; + << "}\n"; texrow.newline(); } switch (style->latextype) { case LATEX_COMMAND: os << '\\' - << style->latexname() - << style->latexparam(); + << style->latexname(); + + // Separate handling of optional argument inset. + if (style->optionalargs == 1) { + InsetOptArg * it = optArgInset(*this); + if (it != 0) + it->latexOptional(buf, os, false, false); + } + else + os << style->latexparam(); break; case LATEX_ITEM_ENVIRONMENT: if (bibkey) { @@ -1285,19 +1116,19 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf, // We do not need to use to change the font for the last paragraph // or for a command. LyXFont const font = - (size() == 0 + (empty() ? getLayoutFont(bparams) : getFont(bparams, size() - 1)); bool is_command = style->isCommand(); if (style->resfont.size() != font.size() && next_ && !is_command) { if (!need_par) - os << "{"; + os << '{'; os << "\\" << font.latexSize() << " \\par}"; } else if (need_par) { os << "\\par}"; } else if (is_command) - os << "}"; + os << '}'; switch (style->latextype) { case LATEX_ITEM_ENVIRONMENT: @@ -1347,7 +1178,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf, if (!params().spacing().isDefault() && (!next_ || !next_->hasSameLayout(this))) { - os << params().spacing().writeEnvirEnd() << "\n"; + os << params().spacing().writeEnvirEnd() << '\n'; texrow.newline(); } } @@ -1380,6 +1211,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf, return next_; } + // This could go to ParagraphParameters if we want to int Paragraph::startTeXParParams(BufferParams const & bparams, ostream & os, bool moving_arg) const @@ -1406,7 +1238,7 @@ int Paragraph::startTeXParParams(BufferParams const & bparams, } break; } - + switch (params().align()) { case LYX_ALIGN_NONE: case LYX_ALIGN_BLOCK: @@ -1440,6 +1272,7 @@ int Paragraph::startTeXParParams(BufferParams const & bparams, return column; } + // This could go to ParagraphParameters if we want to int Paragraph::endTeXParParams(BufferParams const & bparams, ostream & os, bool moving_arg) const @@ -1461,7 +1294,7 @@ int Paragraph::endTeXParParams(BufferParams const & bparams, } break; } - + switch (params().align()) { case LYX_ALIGN_NONE: case LYX_ALIGN_BLOCK: @@ -1524,12 +1357,16 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, // Maybe we have to create a optional argument. pos_type main_body; - if (style->labeltype != LABEL_MANUAL) + + // FIXME: can we actually skip this check and just call + // beginningOfMainBody() ?? + if (style->labeltype != LABEL_MANUAL) { main_body = 0; - else + } else { main_body = beginningOfMainBody(); + } - int column = 0; + unsigned int column = 0; if (main_body > 0) { os << '['; @@ -1546,10 +1383,12 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, // Do we have an open font change? bool open_font = false; + Change::Type running_change = Change::UNCHANGED; + texrow.start(this, 0); // if the paragraph is empty, the loop will not be entered at all - if (!size()) { + if (empty()) { if (style->isCommand()) { os << '{'; ++column; @@ -1632,7 +1471,12 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, running_font = font; open_font = true; } - + + Change::Type change = pimpl_->lookupChange(i); + + column += Changes::latexMarkChange(os, running_change, change); + running_change = change; + if (c == Paragraph::META_NEWLINE) { // newlines are handled differently here than // the default in SimpleTeXSpecialChars(). @@ -1647,7 +1491,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, running_font = basefont; if (font.family() == LyXFont::TYPEWRITER_FAMILY) { - os << "~"; + os << '~'; } if (moving_arg) os << "\\protect "; @@ -1662,10 +1506,14 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, os, texrow, moving_arg, font, running_font, basefont, open_font, + running_change, *style, i, column, c); } } + column += Changes::latexMarkChange(os, + running_change, Change::UNCHANGED); + // If we have an open font definition, we have to close it if (open_font) { #ifdef FIXED_LANGUAGE_END_DETECTION @@ -1703,70 +1551,6 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, } -bool Paragraph::sgmlConvertChar(char c, string & sgml_string) -{ - bool retval = false; - switch (c) { - case Paragraph::META_HFILL: - sgml_string.erase(); - break; - case Paragraph::META_NEWLINE: - sgml_string = '\n'; - break; - case '&': - sgml_string = "&"; - break; - case '<': - sgml_string = "<"; - break; - case '>': - sgml_string = ">"; - break; - case '$': - sgml_string = "$"; - break; - case '#': - sgml_string = "#"; - break; - case '%': - sgml_string = "%"; - break; - case '[': - sgml_string = "["; - break; - case ']': - sgml_string = "]"; - break; - case '{': - sgml_string = "{"; - break; - case '}': - sgml_string = "}"; - break; - case '~': - sgml_string = "˜"; - break; - case '"': - sgml_string = """; - break; - case '\\': - sgml_string = "\"; - break; - case ' ': - retval = true; - sgml_string = ' '; - break; - case '\0': // Ignore :-) - sgml_string.erase(); - break; - default: - sgml_string = c; - break; - } - return retval; -} - - Paragraph * Paragraph::TeXEnvironment(Buffer const * buf, BufferParams const & bparams, ostream & os, TexRow & texrow) @@ -1931,18 +1715,8 @@ bool Paragraph::isWord(pos_type pos) const Language const * Paragraph::getParLanguage(BufferParams const & bparams) const { - if (size() > 0) { -#ifndef INHERIT_LANGUAGE + if (!empty()) { return getFirstFontSettings().language(); -#else - Language const * lang = getFirstFontSettings().language(); -#ifdef WITH_WARNINGS -#warning We should make this somewhat better, any ideas? (Jug) -#endif - if (lang == inherit_language || lang == ignore_language) - lang = bparams.language; - return lang; -#endif } else if (previous_) return previous_->getParLanguage(bparams); else @@ -1981,9 +1755,6 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams) for (; cit != end; ++cit) if (cit->font().language() != ignore_language && cit->font().language() != latex_language && -#ifdef INHERIT_LANGUAGE - cit->font().language() != inherit_language && -#endif cit->font().language() != doc_language) return true; return false; @@ -1992,13 +1763,11 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams) // Convert the paragraph to a string. // Used for building the table of contents -string const Paragraph::asString(Buffer const * buffer, bool label) +string const Paragraph::asString(Buffer const * buffer, bool label) const { - BufferParams const & bparams = buffer->params; string s; if (label && !params().labelString().empty()) s += params().labelString() + ' '; - string::size_type const len = s.size(); for (pos_type i = 0; i < size(); ++i) { value_type c = getChar(i); @@ -2008,19 +1777,16 @@ string const Paragraph::asString(Buffer const * buffer, bool label) getInset(i)->lyxCode() == Inset::MATH_CODE) { ostringstream ost; getInset(i)->ascii(buffer, ost); - s += subst(ost.str().c_str(),'\n',' '); + s += subst(STRCONV(ost.str()),'\n',' '); } } - if (isRightToLeftPar(bparams)) - reverse(s.begin() + len,s.end()); - return s; } string const Paragraph::asString(Buffer const * buffer, - pos_type beg, pos_type end, bool label) + pos_type beg, pos_type end, bool label) const { ostringstream ost; @@ -2040,18 +1806,18 @@ string const Paragraph::asString(Buffer const * buffer, } } - return ost.str().c_str(); + return STRCONV(ost.str()); } void Paragraph::setInsetOwner(Inset * i) { pimpl_->inset_owner = i; - InsetList::const_iterator cit = insetlist.begin(); - InsetList::const_iterator end = insetlist.end(); - for (; cit != end; ++cit) { - if (cit->inset) - cit->inset->setOwner(i); + InsetList::iterator it = insetlist.begin(); + InsetList::iterator end = insetlist.end(); + for (; it != end; ++it) { + if (it.getInset()) + it.getInset()->setOwner(i); } } @@ -2059,30 +1825,14 @@ void Paragraph::setInsetOwner(Inset * i) void Paragraph::deleteInsetsLyXText(BufferView * bv) { // then the insets - InsetList::const_iterator cit = insetlist.begin(); - InsetList::const_iterator end = insetlist.end(); - for (; cit != end; ++cit) { - if (cit->inset && cit->inset->isTextInset()) { - static_cast - (cit->inset)->deleteLyXText(bv, true); - } - } + insetlist.deleteInsetsLyXText(bv); } void Paragraph::resizeInsetsLyXText(BufferView * bv) { // then the insets - InsetList::const_iterator cit = insetlist.begin(); - InsetList::const_iterator end = insetlist.end(); - for (; cit != end; ++cit) { - if (cit->inset) { - if (cit->inset->isTextInset()) { - static_cast - (cit->inset)->resizeLyXText(bv, true); - } - } - } + insetlist.resizeInsetsLyXText(bv); } @@ -2092,27 +1842,89 @@ void Paragraph::setContentsFromPar(Paragraph * par) } +void Paragraph::trackChanges(Change::Type type) +{ + pimpl_->trackChanges(type); +} + + +void Paragraph::untrackChanges() +{ + pimpl_->untrackChanges(); +} + + +void Paragraph::cleanChanges() +{ + pimpl_->cleanChanges(); +} + + +Change::Type Paragraph::lookupChange(lyx::pos_type pos) const +{ + lyx::Assert(!size() || pos < size()); + return pimpl_->lookupChange(pos); +} + + +Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const +{ + lyx::Assert(!size() || pos < size()); + return pimpl_->lookupChangeFull(pos); +} + + +bool Paragraph::isChanged(pos_type start, pos_type end) const +{ + return pimpl_->isChanged(start, end); +} + + +bool Paragraph::isChangeEdited(pos_type start, pos_type end) const +{ + return pimpl_->isChangeEdited(start, end); +} + + +void Paragraph::markErased() +{ + pimpl_->markErased(); +} + + +void Paragraph::acceptChange(pos_type start, pos_type end) +{ + return pimpl_->acceptChange(start, end); +} + + +void Paragraph::rejectChange(pos_type start, pos_type end) +{ + return pimpl_->rejectChange(start, end); +} + + lyx::pos_type Paragraph::size() const { return pimpl_->size(); } -Paragraph::value_type Paragraph::getChar(pos_type pos) const +bool Paragraph::empty() const { - return pimpl_->getChar(pos); + return pimpl_->empty(); } -int Paragraph::id() const +Paragraph::value_type Paragraph::getChar(pos_type pos) const { - return pimpl_->id_; + return pimpl_->getChar(pos); } -void Paragraph::id(int id_arg) +int Paragraph::id() const { - pimpl_->id_ = id_arg; + return pimpl_->id_; } @@ -2154,23 +1966,6 @@ void Paragraph::setChar(pos_type pos, value_type c) } -Paragraph::inset_iterator::inset_iterator(Paragraph::InsetList::iterator const & iter) - : it(iter) -{} - - -Paragraph::inset_iterator Paragraph::inset_iterator_begin() -{ - return inset_iterator(insetlist.begin()); -} - - -Paragraph::inset_iterator Paragraph::inset_iterator_end() -{ - return inset_iterator(insetlist.end()); -} - - ParagraphParameters & Paragraph::params() { return pimpl_->params; @@ -2197,10 +1992,3 @@ bool Paragraph::isFreeSpacing() const return (pimpl_->inset_owner->owner()->lyxCode() == Inset::ERT_CODE); return false; } - - -Counters & Paragraph::counters() -{ - return pimpl_->ctrs; -} -